diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 236847d4..e96d3449 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -24,7 +24,7 @@ void setbottimeout(int m, int t) { switch(m) { - case 1: + case 1: { extern int botmatch_dm_minremain; botmatch_dm_minremain = t; @@ -855,7 +855,7 @@ void setkillmessage(int gun, bool gib, const char *message) conoutf("invalid gun specified"); return; } - + copystring(killmessages[gib?1:0][gun], message, sizeof(killmessages[gib?1:0][gun])); } @@ -1169,6 +1169,7 @@ COMMAND(gamemodedesc, ARG_2STR); void resetmap(bool mrproper) { resetsleep(); + resetzone(); clearminimap(); cleardynlights(); pruneundos(); diff --git a/source/src/protos.h b/source/src/protos.h index 048ca52f..20e645d7 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -250,6 +250,7 @@ extern void setperspective(float fovy, float aspect, float nearplane, float farp extern void sethudgunperspective(bool on); extern void gl_drawframe(int w, int h, float changelod, float curfps); extern void clearminimap(); +extern void resetzone(); extern void rendercursor(int x, int y, int w); extern void renderaboveheadicon(playerent *p); extern void drawscope(bool preload = false); diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index f3f87383..d9502c8c 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -848,7 +848,6 @@ void cleanupgl() minimapdirty = true; } - void drawzone(int x1, int x2, int y1, int y2) { zonex1 = x1; zoney1 = y1; @@ -857,6 +856,11 @@ void drawzone(int x1, int x2, int y1, int y2) } COMMAND(drawzone, ARG_4INT); +void resetzone() +{ + zonex1 = zoney1 = zonex2 = zoney2 = 0; +} + int xtraverts; VARP(hudgun, 0, 1, 1);