diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/strife/m_menu.c | 18 | ||||
| -rw-r--r-- | src/strife/m_menu.h | 2 | ||||
| -rw-r--r-- | src/strife/p_dialog.c | 2 | ||||
| -rw-r--r-- | src/strife/p_doors.c | 10 | ||||
| -rw-r--r-- | src/strife/p_spec.h | 4 |
5 files changed, 19 insertions, 17 deletions
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c index 8fc049a5..62a56ab2 100644 --- a/src/strife/m_menu.c +++ b/src/strife/m_menu.c @@ -1333,15 +1333,15 @@ int M_StringHeight(char* string) // int M_WriteText -( int x, - int y, - char* string) -{ - int w; - char* ch; - int c; - int cx; - int cy; +( int x, + int y, + const char* string) // haleyjd: made const for safety w/dialog engine +{ + int w; + const char* ch; + int c; + int cx; + int cy; ch = string; cx = x; diff --git a/src/strife/m_menu.h b/src/strife/m_menu.h index b302ea08..bbd2d9bc 100644 --- a/src/strife/m_menu.h +++ b/src/strife/m_menu.h @@ -94,7 +94,7 @@ void M_Init (void); void M_StartControlPanel (void); // haleyjd 09/04/10: Externalized. Draws menu text. -int M_WriteText(int x, int y, char *string); +int M_WriteText(int x, int y, const char *string); // haleyjd 09/04/10: [STRIFE] New function. void M_DialogDimMsg(int x, int y, char *str, boolean useyfont); diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c index 1557c369..da46f4c2 100644 --- a/src/strife/p_dialog.c +++ b/src/strife/p_dialog.c @@ -379,7 +379,7 @@ static int dialogbgpiclumpnum; static char *dialogname;
// Current dialog text.
-static char *dialogtext;
+static const char *dialogtext;
//=============================================================================
//
diff --git a/src/strife/p_doors.c b/src/strife/p_doors.c index 9a536c64..b9696a53 100644 --- a/src/strife/p_doors.c +++ b/src/strife/p_doors.c @@ -498,13 +498,14 @@ int EV_DoDoor(line_t* line, vldoor_e type) // // villsa [STRIFE] new function // -int EV_ClearForceFields(line_t* line) +boolean EV_ClearForceFields(line_t* line) { int secnum; int rtn; sector_t* sec; int i; line_t* secline; + boolean ret = false; secnum = -1; rtn = 0; @@ -515,10 +516,9 @@ int EV_ClearForceFields(line_t* line) rtn = 1; line->special = 0; + ret = true; - if(!sec->linecount) - return; - + // haleyjd 09/18/10: fixed to continue w/linecount == 0, not return for(i = 0; i < sec->linecount; i++) { secline = sec->lines[i]; @@ -533,6 +533,8 @@ int EV_ClearForceFields(line_t* line) sides[secline->sidenum[1]].midtexture = 0; } } + + return ret; } diff --git a/src/strife/p_spec.h b/src/strife/p_spec.h index 215c7644..49c5fbd9 100644 --- a/src/strife/p_spec.h +++ b/src/strife/p_spec.h @@ -131,8 +131,8 @@ getNextSector // // SPECIAL // -int EV_DoDonut(line_t* line); -int EV_ClearForceFields(line_t* line); // villsa [STRIFE] +int EV_DoDonut(line_t* line); +boolean EV_ClearForceFields(line_t* line); // villsa [STRIFE] // |