minor code tweaks

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5228 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-06-25 19:26:21 +00:00
parent 201ba99c79
commit 1bb161a0cb
3 changed files with 4 additions and 2 deletions
+1
View File
@@ -878,6 +878,7 @@ void startmap(const char *name, bool reset) // called just after a map load
if(mapstartonce && mapstartonce[0])
{
addsleep(0, mapstartonce); // do this as a sleep to make sure map changes don't recurse inside a welcome packet
// BTW: in v1.0.4 sleep 1 was required to make it work on initial mapload [flowtron:2010jun25]
alias("mapstartonce", "");
}
}
+2 -1
View File
@@ -311,7 +311,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
if(prot!=CUR_PROTOCOL_VERSION && !(watchingdemo && prot == -PROTOCOL_VERSION))
{
conoutf(_("\f3you are using a different game protocol (you: %d, server: %d)"), CUR_PROTOCOL_VERSION, prot);
disconnect();
if(watchingdemo) conoutf("breaking loop : \f3this demo is using a different protocol\f5 : end it now!"); // SVN-WiP-bug: causes endless retry loop else!
else disconnect();
return;
}
sessionid = getint(p);
+1 -1
View File
@@ -7,7 +7,7 @@ void drawicon(Texture *tex, float x, float y, float s, int col, int row, float t
if(tex && tex->xs == tex->ys) quad(tex->id, x, y, s, ts*col, ts*row, ts);
}
VARP(equiptransparency, 0, 0, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection
VARP(equiptransparency, 0, 1, 1); // ft: 2010jun12 : seems it's not needed - the opaque/orig items.png works with it on or off - delete if no graphics guy has any objection
void drawequipicon(float x, float y, int col, int row, float blend)
{