variable declarations come first
This commit is contained in:
parent
fd42ac5cb1
commit
39b0dacd6a
|
@ -1,5 +1,9 @@
|
||||||
D2X-Rebirth Changelog
|
D2X-Rebirth Changelog
|
||||||
|
|
||||||
|
20120405
|
||||||
|
--------
|
||||||
|
main/multi.c: variable declarations come first
|
||||||
|
|
||||||
20120331
|
20120331
|
||||||
--------
|
--------
|
||||||
d2x-rebirth.xcodeproj/project.pbxproj, 2d/font.c: Make sure the ogl font code recognises the editor font is fixed width, fixing a crash; take the plunge and make D2X Rebirth compile with editor for Mac OpenGL build (won't work yet)
|
d2x-rebirth.xcodeproj/project.pbxproj, 2d/font.c: Make sure the ogl font code recognises the editor font is fixed width, fixing a crash; take the plunge and make D2X Rebirth compile with editor for Mac OpenGL build (won't work yet)
|
||||||
|
|
|
@ -1606,8 +1606,8 @@ multi_do_message(char *buf)
|
||||||
|
|
||||||
if (((colon = strstr(buf+loc, ": ")) == NULL) || (colon-(buf+loc) < 1) || (colon-(buf+loc) > CALLSIGN_LEN))
|
if (((colon = strstr(buf+loc, ": ")) == NULL) || (colon-(buf+loc) < 1) || (colon-(buf+loc) > CALLSIGN_LEN))
|
||||||
{
|
{
|
||||||
mesbuf[0] = CC_COLOR;
|
|
||||||
int color = 0;
|
int color = 0;
|
||||||
|
mesbuf[0] = CC_COLOR;
|
||||||
if (Game_mode & GM_TEAM)
|
if (Game_mode & GM_TEAM)
|
||||||
color = get_team((int)buf[1]);
|
color = get_team((int)buf[1]);
|
||||||
else
|
else
|
||||||
|
@ -1629,8 +1629,8 @@ multi_do_message(char *buf)
|
||||||
if ( (!strnicmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) ||
|
if ( (!strnicmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) ||
|
||||||
((Game_mode & GM_TEAM) && ( (get_team(Player_num) == atoi(buf+loc)-1) || !strnicmp(Netgame.team_name[get_team(Player_num)], buf+loc, colon-(buf+loc)))) )
|
((Game_mode & GM_TEAM) && ( (get_team(Player_num) == atoi(buf+loc)-1) || !strnicmp(Netgame.team_name[get_team(Player_num)], buf+loc, colon-(buf+loc)))) )
|
||||||
{
|
{
|
||||||
mesbuf[0] = CC_COLOR;
|
|
||||||
int color = 0;
|
int color = 0;
|
||||||
|
mesbuf[0] = CC_COLOR;
|
||||||
if (Game_mode & GM_TEAM)
|
if (Game_mode & GM_TEAM)
|
||||||
color = get_team((int)buf[1]);
|
color = get_team((int)buf[1]);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue