diff --git a/SConstruct b/SConstruct index ea59052cf..04f4104f1 100644 --- a/SConstruct +++ b/SConstruct @@ -830,7 +830,7 @@ class DXXProgram(DXXCommon): 'editor/kcurve.cpp', 'editor/kfuncs.cpp', 'editor/kgame.cpp', -'editor/khelp.c', +'editor/khelp.cpp', 'editor/kmine.c', 'editor/ksegmove.c', 'editor/ksegsel.c', diff --git a/similar/editor/khelp.c b/similar/editor/khelp.cpp similarity index 91% rename from similar/editor/khelp.c rename to similar/editor/khelp.cpp index 19fcc94f5..2fb9b6dcb 100644 --- a/similar/editor/khelp.c +++ b/similar/editor/khelp.cpp @@ -20,10 +20,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "editor.h" +#include "kdefs.h" #include "ui.h" -static char MainHelpText[] = "\nMED General Functions\n\n" \ +static const char MainHelpText[] = "\nMED General Functions\n\n" \ "SPACEBAR Full Redraw\n" \ "BACKSPACE Drop into debugger\n\n" \ "A Attach a segment\n" \ @@ -36,7 +37,7 @@ static char MainHelpText[] = "\nMED General Functions\n\n" \ "ESC Exit editor\n"\ "ALT-Q/CTRL-Q/SHIFT-Q also Exit editor\n"; -static char SegmentHelpText[] = "MED Segment Functions\n\n" \ +static const char SegmentHelpText[] = "MED Segment Functions\n\n" \ "ALT-B Create Bridge from current to marked segment\n" \ "ALT-E Exchange current and marked segments\n" \ "ALT-J Create Joint between current and marked segments\n" \ @@ -56,7 +57,7 @@ static char SegmentHelpText[] = "MED Segment Functions\n\n" \ "CTRL-F Select next side\n" \ "CTRL-SHIFT-F Select previous side\n"; -static char KeyPadHelpText[] = "MED KeyPad Functions\n\n" \ +static const char KeyPadHelpText[] = "MED KeyPad Functions\n\n" \ "SHIFT-KEYPAD FUNCTIONS (Change direction vector of segment)\n" \ "----------------------\n" \ @@ -72,7 +73,7 @@ static char KeyPadHelpText[] = "MED KeyPad Functions\n\n" \ "\nIn addition, CTRL-SHIFT-KEYPAD Changes size at x5 rate as above\n"; -char ViewHelpText[] = "MED View Changing Functions\n\n" \ +static const char ViewHelpText[] = "MED View Changing Functions\n\n" \ "ALT-V Change to orthogonal view (1,2,3)\n" \ "CTRL-V Toggle view to current segment\n" \ "MINUS (-) Zoom in\n" \ @@ -85,7 +86,7 @@ char ViewHelpText[] = "MED View Changing Functions\n\n" \ //"CTRL-MINUS Decreases drawing depth\n" //"CTRL-EQUAL Increases drawing depth\n" -static char GameHelpText[] = "MED Game Screen Functions\n\n" \ +static const char GameHelpText[] = "MED Game Screen Functions\n\n" \ "KEYPAD FUNCTIONS (Moves in game screen)\n" \ "----------------\n" \ "(7) 8 Move Forward (9)\n" \ @@ -102,7 +103,7 @@ static char GameHelpText[] = "MED Game Screen Functions\n\n" \ "PAD DIVIDE (/) Game Zoom out\n" \ "PAD MULTIPLY (*) Game Zoom In\n"; -static char CurveHelpText[] = "MED Curve Generation Functions\n\n" \ +static const char CurveHelpText[] = "MED Curve Generation Functions\n\n" \ "ALT-F10 Generate curve\n" \ "F8 Delete curve\n" \ "F11 'Set' curve\n" \ @@ -111,7 +112,7 @@ static char CurveHelpText[] = "MED Curve Generation Functions\n\n" \ "F10 Decrease r4 vector\n" \ "SHIFT-F10 Increase r4 vector\n"; -static char MacrosHelpText[] = "MED Macros Functions\n\n" \ +static const char MacrosHelpText[] = "MED Macros Functions\n\n" \ "CTRL-INSERT Play fast\n" \ "CTRL-DELETE Play normal\n" \ "CTRL-HOME Record all\n" \