*** empty log message ***
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1083 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
+1
-1
@@ -25,7 +25,7 @@ keymap 43 PLUS ""
|
||||
keymap 44 COMMA "equalize 0"
|
||||
keymap 45 MINUS ""
|
||||
keymap 46 PERIOD "equalize 2"
|
||||
keymap 47 SLASH ""
|
||||
keymap 47 SLASH "saycommand /"
|
||||
keymap 48 0 "weapon 0 1 2"
|
||||
keymap 49 1 "weapon 1 2 4"
|
||||
keymap 50 2 "weapon 2 1 4"
|
||||
|
||||
@@ -87,7 +87,6 @@ extern bool minimap, reflecting, refracting;
|
||||
extern bool demoplayback;
|
||||
extern bool intermission;
|
||||
extern int maxclients;
|
||||
extern hashtable<char *, enet_uint32> mapinfo;
|
||||
extern bool hasTE, hasMT, hasMDA;
|
||||
|
||||
extern int VIRTW; // virtual screen size for text & HUD
|
||||
|
||||
+2
-1
@@ -106,7 +106,8 @@ void screenres(int w, int h, int bpp = 0)
|
||||
#if defined(WIN32) || defined(__APPLE__) || !defined(WIN32)
|
||||
void setresdata(char *s, enet_uint32 c)
|
||||
{
|
||||
mapinfo[newstring(s)] = c;
|
||||
extern hashtable<char *, enet_uint32> &resdata;
|
||||
resdata[newstring(s)] = c;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include "cube.h"
|
||||
#include "bot/bot.h"
|
||||
|
||||
hashtable<char *, enet_uint32> mapinfo;
|
||||
|
||||
sqr *world = NULL;
|
||||
int sfactor, ssize, cubicsize, mipsize;
|
||||
@@ -150,6 +149,8 @@ void entproperty(int prop, int amount)
|
||||
}
|
||||
}
|
||||
|
||||
hashtable<char *, enet_uint32> mapinfo, &resdata = mapinfo;
|
||||
|
||||
void delent()
|
||||
{
|
||||
int e = closestent();
|
||||
|
||||
Reference in New Issue
Block a user