summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-01-16 23:36:02 +0100
committerTreeki <treeki@gmail.com>2012-01-16 23:36:02 +0100
commit28efd888af3ffe227565683e2cd2960ea5b52f61 (patch)
tree4f661990c53bc12767329c612f0b7dcd3b820a27
parentb4cedffe6562aecc3b7afe6c480427e05b8fa277 (diff)
downloadkamek-28efd888af3ffe227565683e2cd2960ea5b52f61.tar.gz
kamek-28efd888af3ffe227565683e2cd2960ea5b52f61.zip
moved levelinfo to levelinfo_old, so I can add the C++ API
Diffstat (limited to '')
-rw-r--r--src/levelinfo_old.cpp2
-rw-r--r--src/levelnames.cpp2
-rw-r--r--src/worldmap.h2
-rw-r--r--worldmap.yaml2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/levelinfo_old.cpp b/src/levelinfo_old.cpp
index ec65350..01dda85 100644
--- a/src/levelinfo_old.cpp
+++ b/src/levelinfo_old.cpp
@@ -1,4 +1,4 @@
-#include "levelinfo.h"
+#include "levelinfo_old.h"
void LevelInfo_Prepare(FileHandle *fh) {
void *file = fh->filePtr;
diff --git a/src/levelnames.cpp b/src/levelnames.cpp
index 95d7e5d..02aa4b7 100644
--- a/src/levelnames.cpp
+++ b/src/levelnames.cpp
@@ -1,7 +1,7 @@
#include <common.h>
#include <actors.h>
#include <stage.h>
-#include "levelinfo.h"
+#include "levelinfo_old.h"
#include "fileload.h"
#include "layoutlib.h"
diff --git a/src/worldmap.h b/src/worldmap.h
index 82032e6..748a019 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -15,7 +15,7 @@
#include "layoutlib.h"
#include "fileload.h"
-#include "levelinfo.h"
+#include "levelinfo_old.h"
#ifdef WM_DEBUGGING
#define MapReport OSReport
diff --git a/worldmap.yaml b/worldmap.yaml
index 4ca48f3..ce5f624 100644
--- a/worldmap.yaml
+++ b/worldmap.yaml
@@ -3,7 +3,7 @@ source_files:
- ../src/worldmap.cpp
- ../src/fileload.cpp
- ../src/asmlib.S
- - ../src/levelinfo.cpp
+ - ../src/levelinfo_old.cpp
- ../src/layoutlib.S
- ../src/scene.S
- ../src/player.cpp