blob: 5c77527dc598025fb8fc969ad2b547c10d8aeed4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- a/properties.h
+++ b/properties.h
@@ -33,9 +33,7 @@
#include <map>
#include <string>
-#ifdef WIN32
using namespace std;
-#endif
#include "defs.h"
--- a/anim.h
+++ b/anim.h
@@ -27,9 +27,7 @@
// Language Includes
#include <list>
-#ifdef WIN32
using namespace std;
-#endif
// Application Includes
#include "graph.h"
--- a/exception.h
+++ b/exception.h
@@ -27,10 +27,9 @@
// Language Includes
#include <string>
+#include <iostream>
-#ifdef WIN32
using namespace std;
-#endif
#define CatchEx(aEx) catch( CXLException aEx )
#define ThrowEx(aError) throw CXLException(aError,__FILE__,__LINE__)
--- a/gamelogic.cpp
+++ b/gamelogic.cpp
@@ -154,7 +154,7 @@
levelFile = NULL;
}
- currentMap = NULL;
+ currentMap = gameLevels.begin();
playerName = new char[32+1];
strcpy( playerName, "nobody" );
|
GitWeb
