kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new shotgun behaviour

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6012 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2011-01-17 18:27:53 +00:00
parent 5438b1a8ab
commit 0b63d7d07e
7 changed files with 140 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+4 -4
View File
@@ -590,7 +590,7 @@ void respawnself()
spawnplayer(player1);
player1->lifesequence++;
player1->weaponswitch(player1->primweap);
player1->weaponchanging -= weapon::weaponchangetime/2;
player1->weaponchanging -= player1->weapons[player1->gunselect]->weaponchangetime/2; // 2011jan16:ft: for a little no-shoot after spawn
}
}
@@ -608,14 +608,14 @@ inline const char * spawn_message()
if (spawnpermission == SP_WRONGMAP)
{
// Don't use "/n" within these messages. If you do, the words won't align to the middle of the screen.
if (securemapcheck(getclientmap()))
if (securemapcheck(getclientmap()))
return "3Server will NOT allow spawning or getmap!"; // Also see client.cpp which has a conoutf message
else return "3You must be on the correct map to spawn. Type /getmap to download it.";
}
else if (m_coop) return "3Type /getmap or send a map and vote for it to start co-op edit.";
else return "4Awaiting permission to spawn. \f2DON\'T PANIC!";
// Despite its many glaring (and occasionally fatal) inaccuracies, AssaultCube itself has outsold the
// Encyclopedia Galactica because it is slightly cheaper, and because it has the words "Don't Panic"
// Despite its many glaring (and occasionally fatal) inaccuracies, AssaultCube itself has outsold the
// Encyclopedia Galactica because it is slightly cheaper, and because it has the words "Don't Panic"
// in large, friendly letters.
}