From 90d9a2e0efc42c915c16620dda050fe6172c3a5b Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Sat, 2 Jun 2007 02:54:12 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1083 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/keymap.cfg    | 2 +-
 source/src/cube.h    | 1 -
 source/src/main.cpp  | 3 ++-
 source/src/world.cpp | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/config/keymap.cfg b/config/keymap.cfg
index 61e78f9e..87f0edec 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -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"
diff --git a/source/src/cube.h b/source/src/cube.h
index c772b1b3..4a15285a 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -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
diff --git a/source/src/main.cpp b/source/src/main.cpp
index 739a37a8..f9f4ce4e 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -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
 
diff --git a/source/src/world.cpp b/source/src/world.cpp
index a187d360..7a75a9ad 100644
--- a/source/src/world.cpp
+++ b/source/src/world.cpp
@@ -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();