summaryrefslogtreecommitdiff
path: root/BlockCondition.cpp
diff options
context:
space:
mode:
authorJonas Ask2009-11-27 15:35:35 +0000
committerJonas Ask2009-11-27 15:35:35 +0000
commitcf382c626ec583ab1abcbef7d1f38afaaaf91d67 (patch)
treea8b2287de5c24c5ef5a967eca4008c43232adf5b /BlockCondition.cpp
parent0a9fcbb2889a3db04c7bc96c3539d4a68ff8b623 (diff)
downloadstonesense-cf382c626ec583ab1abcbef7d1f38afaaaf91d67.tar.gz
stonesense-cf382c626ec583ab1abcbef7d1f38afaaaf91d67.tar.bz2
stonesense-cf382c626ec583ab1abcbef7d1f38afaaaf91d67.tar.xz
Started working on a unified system for loading content configuration.
Diffstat (limited to 'BlockCondition.cpp')
-rw-r--r--BlockCondition.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/BlockCondition.cpp b/BlockCondition.cpp
index 12a8b82..0b789f0 100644
--- a/BlockCondition.cpp
+++ b/BlockCondition.cpp
@@ -1,6 +1,7 @@
#include "BlockCondition.h"
#include "GameBuildings.h"
#include "WorldSegment.h"
+#include "ContentLoader.h"
#include <iostream>
int getDirectionFromString(const char* strDir)
@@ -31,8 +32,8 @@ int getDirectionFromString(const char* strDir)
int getBuildingFromString(const char* strType)
{
- for (uint32_t i=0; i<v_buildingtypes.size(); i++){
- if (v_buildingtypes[i].compare(strType) == 0)
+ for (uint32_t i=0; i<contentLoader.buildingNameStrings.size(); i++){
+ if (contentLoader.buildingNameStrings[i].compare(strType) == 0)
{
return i;
}