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

minor tweaks

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5466 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-07-28 11:25:17 +00:00
parent e93c029437
commit ad67963f88
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/menus.cpp
+3 -21
View File
@@ -894,27 +894,9 @@ void menuitemmapload(char *name, char *text)
{
if(!lastmenu) return;
string caction;
string title;
if(text[0]!='\0') formatstring(title)("%s", text);
else formatstring(title)("%s", name);
if(strcmp(name,text)==0)
{
formatstring(caction)("map %s", name);
}
else
{
defformatstring(jac)("ac_%s", text);
if(strcmp(jac,name)==0)
{
formatstring(caction)("map %s", name);
}
else
{
copystring(caction, text);
}
}
defformatstring(fullp2m)("packages/maps/%s.cgz", name);
lastmenu->items.add(new mitemmapload(lastmenu, newstring(name), newstring(title), newstring(caction), NULL, NULL, NULL));
if(!text || text[0]=='\0') formatstring(caction)("map %s", name);
else formatstring(caction)("%s", text);
lastmenu->items.add(new mitemmapload(lastmenu, newstring(name), newstring(name), newstring(caction), NULL, NULL, NULL));
}
void menuitemtextinput(char *text, char *value, char *action, char *hoveraction, char *maxchars)
source/src/weapon.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ void quicknadethrow(bool on)
if(player1->weapons[GUN_GRENADE]->mag > 0)
{
if(player1->weaponsel->type != GUN_GRENADE) selectweapon(player1->weapons[GUN_GRENADE]);
if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold ) attack(true);
if(player1->weaponsel->type == GUN_GRENADE || quicknade_hold) attack(true); // TODO: use a flag for all weapons to shoot (only action?) once they've successfully reloaded or been switched to. Would need to get purged at appropriate time too.
}
}
else