diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-10-22 17:52:17 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-10-22 17:52:17 +0200 |
| commit | 2d043d46bb85f486847300080e4d58add49c0a44 (patch) | |
| tree | b79da960c4d3b7d0452b0a199be19da61133df30 /src/common | |
| parent | d3a722a0c56119f13d5ff3e68e9f4560c7924788 (diff) | |
| parent | d019a4990f2e2da71555daf085a3e09c92085fa5 (diff) | |
| download | colobot-2d043d46bb85f486847300080e4d58add49c0a44.tar.gz colobot-2d043d46bb85f486847300080e4d58add49c0a44.tar.bz2 colobot-2d043d46bb85f486847300080e4d58add49c0a44.zip | |
Merge branch 'vieux-blood_mode' into dev
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/event.h | 1 | ||||
| -rw-r--r-- | src/common/restext.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/common/event.h b/src/common/event.h index 7637e34..bb9e123 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -240,6 +240,7 @@ enum EventType EVENT_INTERFACE_EDITMODE= 476, EVENT_INTERFACE_EDITVALUE= 477, EVENT_INTERFACE_SOLUCE4 = 478, + EVENT_INTERFACE_BLOOD = 479, EVENT_INTERFACE_KINFO1 = 500, EVENT_INTERFACE_KINFO2 = 501, diff --git a/src/common/restext.cpp b/src/common/restext.cpp index dcecb81..95e015c 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -205,6 +205,7 @@ void InitializeRestext() stringsEvent[EVENT_INTERFACE_EDITMODE] = TR("Automatic indent\\When program editing"); stringsEvent[EVENT_INTERFACE_EDITVALUE] = TR("Big indent\\Indent 2 or 4 spaces per level defined by braces"); stringsEvent[EVENT_INTERFACE_SOLUCE4] = TR("Access to solutions\\Show program \"4: Solution\" in the exercises"); + stringsEvent[EVENT_INTERFACE_BLOOD] = TR("Blood\\Display blood when the astronaut or the alien queen is hit"); stringsEvent[EVENT_INTERFACE_KDEF] = TR("Standard controls\\Standard key functions"); stringsEvent[EVENT_INTERFACE_KLEFT] = TR("Turn left\\turns the bot to the left"); |