diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-01 17:30:20 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-01 17:30:20 +0000 |
| commit | 67aa042dcbf9938896f20f47d2a778761efa4dcc (patch) | |
| tree | 3cb7981aca800b2010bab05065920187bbea0fa8 | |
| parent | 9c704c6a0510e9c5f8af8e9c1f810e9688345111 (diff) | |
| download | zcatch-67aa042dcbf9938896f20f47d2a778761efa4dcc.tar.gz zcatch-67aa042dcbf9938896f20f47d2a778761efa4dcc.zip | |
compile fixes for windows
| -rw-r--r-- | datasrc/datatypes.py | 14 | ||||
| -rw-r--r-- | src/game/client/gc_render.cpp | 1 | ||||
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/datasrc/datatypes.py b/datasrc/datatypes.py index 0b83493f..2b1e3e82 100644 --- a/datasrc/datatypes.py +++ b/datasrc/datatypes.py @@ -94,11 +94,15 @@ class Array(BaseType): lines += item.EmitPreDefinition("%s[%d]"%(self.Identifyer(), i)) i += 1 - lines += ["static %s %s[] = {"%(self.TypeName(), self.Identifyer())] - for item in self.items: - itemlines = item.EmitDefinition("") - lines += ["\t" + " ".join(itemlines).replace("\t", " ") + ","] - lines += ["};"] + if len(self.items): + lines += ["static %s %s[] = {"%(self.TypeName(), self.Identifyer())] + for item in self.items: + itemlines = item.EmitDefinition("") + lines += ["\t" + " ".join(itemlines).replace("\t", " ") + ","] + lines += ["};"] + else: + lines += ["static %s *%s = 0;"%(self.TypeName(), self.Identifyer())] + return lines def EmitDefinition(self, name): return [str(len(self.items))+","+self.Identifyer()] diff --git a/src/game/client/gc_render.cpp b/src/game/client/gc_render.cpp index 4dcc4583..74cfc850 100644 --- a/src/game/client/gc_render.cpp +++ b/src/game/client/gc_render.cpp @@ -10,7 +10,6 @@ #include <game/layers.hpp> #include "animstate.hpp" #include "gc_render.hpp" -#include "gc_map_image.hpp" static float sprite_w_scale; static float sprite_h_scale; diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 940472ce..e4e04478 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -12,7 +12,6 @@ extern "C" { #include <engine/e_config.h> } -#include <game/client/gc_map_image.hpp> #include <game/client/ui.hpp> #include <game/gamecore.hpp> #include <game/client/gc_render.hpp> |