summaryrefslogtreecommitdiff
path: root/UserInput.cpp
diff options
context:
space:
mode:
authorJonas Ask2009-11-27 16:33:09 +0000
committerJonas Ask2009-11-27 16:33:09 +0000
commit9e032669b8b26714941ebe96ec3c1362c6608da0 (patch)
treedaec5737123f81ab8982eb9dedb9edc821aae568 /UserInput.cpp
parent86248d1d3dfdacdab2c4aa7781fa2c048200cccb (diff)
downloadstonesense-9e032669b8b26714941ebe96ec3c1362c6608da0.tar.gz
stonesense-9e032669b8b26714941ebe96ec3c1362c6608da0.tar.bz2
stonesense-9e032669b8b26714941ebe96ec3c1362c6608da0.tar.xz
Hunting a leak in ContentBuildingReader.cpp.
Re-added the G-key to reload content code.
Diffstat (limited to 'UserInput.cpp')
-rw-r--r--UserInput.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/UserInput.cpp b/UserInput.cpp
index 268afe1..3afccc7 100644
--- a/UserInput.cpp
+++ b/UserInput.cpp
@@ -1,7 +1,7 @@
#include "common.h"
#include "GUI.h"
#include "BuildingConfiguration.h"
-#include "GroundMaterialConfiguration.h"
+#include "ContentLoader.h"
#include "GameBuildings.h"
#include "Creatures.h"
@@ -189,15 +189,14 @@ void doKeys(){
if(key[KEY_D]){
paintboard();
}
- /*if(key[KEY_G]){
- LoadCreatureConfiguration( &creatureTypes );
- LoadBuildingConfiguration( &buildingTypes );
- LoadGroundMaterialConfiguration();
+ if(key[KEY_G]){
+ contentLoader.Load();
+
destroyGraphics();
loadGraphicsFromDisk();
timeToReloadSegment = true;
- }*/
+ }
if(key[KEY_U]){
config.show_stockpiles = !config.show_stockpiles;
timeToReloadSegment = true;