moved commands.c/.h into openborscriptfolder

DCurrent · Jul 11, 2018 · 3d1dd3c · 3d1dd3c
1 parent 760fea9
commit 3d1dd3c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/engine/Makefile b/engine/Makefile
@@ -303,7 +303,6 @@ GAME	        = source/gamelib/draw.o
                   source/gamelib/sprite.o                                                          \
                   source/gamelib/spritex8p16.o                                                      \
                   source/gamelib/spritex8p32.o                                                      \
-                  source/gamelib/commands.o                                                         \
                   source/gamelib/models.o                                                           \
                   source/gamelib/transform.o
 SCRIPT          = source/scriptlib/StackedSymbolTable.o                                             \
@@ -320,7 +319,8 @@ SCRIPT          = source/scriptlib/StackedSymbolTable.o
                   source/preprocessorlib/pp_lexer.o                                                 \
                   source/preprocessorlib/pp_parser.o                                                \
                   source/preprocessorlib/pp_expr.o
-SCRIPT_BUILTINS = source/openborscript/animation.o                                                  \
+SCRIPT_BUILTINS = source/openborscript/commands.o                                                   \
+				  source/openborscript/animation.o                                                  \
 				  source/openborscript/axis.o                                           			\
 				  source/openborscript/binding.o                                           			\
                   source/openborscript/collision_attack.o                                           \

diff --git a/engine/source/gamelib/commands.c → engine/source/openborscript/commands.c b/engine/source/gamelib/commands.c → engine/source/openborscript/commands.c
@@ -213,7 +213,7 @@ List *createModelCommandList(void)
     LIST_ADD(CMD_MODEL_BLOCKODDS, "blockodds");
     LIST_ADD(CMD_MODEL_BLOCKPAIN, "blockpain");
     LIST_ADD(CMD_MODEL_BOMB, "bomb");
-    LIST_ADD(CMD_MODEL_BOOMERANG, "boomerang");
+    LIST_ADD(CMD_MODEL_BOOMERANG, "boomerang");
     LIST_ADD(CMD_MODEL_BOOMERANGVALUES, "boomerangvalues");
     LIST_ADD(CMD_MODEL_BOUNCE, "bounce");
     LIST_ADD(CMD_MODEL_BOUNCEFACTOR, "bouncefactor");
@@ -232,7 +232,7 @@ List *createModelCommandList(void)
     LIST_ADD(CMD_MODEL_CREDIT, "credit");
     LIST_ADD(CMD_MODEL_CUSTBOMB, "custbomb");
     LIST_ADD(CMD_MODEL_CUSTENTITY, "custentity");
-    LIST_ADD(CMD_MODEL_CUSTKNIFE, "custknife");
+    LIST_ADD(CMD_MODEL_CUSTKNIFE, "custknife");
     LIST_ADD(CMD_MODEL_CUSTBOOMERANG, "custboomerang");
     LIST_ADD(CMD_MODEL_CUSTPBOMB, "custpbomb");
     LIST_ADD(CMD_MODEL_CUSTPSHOT, "custpshot");
@@ -428,7 +428,7 @@ List *createModelCommandList(void)
     LIST_ADD(CMD_MODEL_SPAWNFRAME, "spawnframe");
     LIST_ADD(CMD_MODEL_SPEED, "speed");
     LIST_ADD(CMD_MODEL_SPEEDF, "speedf");
-    LIST_ADD(CMD_MODEL_STAR, "star");
+    LIST_ADD(CMD_MODEL_STAR, "star");
     LIST_ADD(CMD_MODEL_STAR_VELOCITY, "starvelocity");
     LIST_ADD(CMD_MODEL_STAYDOWN, "staydown");
     LIST_ADD(CMD_MODEL_STEAL, "steal");

diff --git a/engine/source/gamelib/commands.h → engine/source/openborscript/commands.h b/engine/source/gamelib/commands.h → engine/source/openborscript/commands.h
@@ -333,7 +333,7 @@ typedef enum modelCommand
     CMD_MODEL_BLOCKODDS,
     CMD_MODEL_BLOCKPAIN,
     CMD_MODEL_BOMB,
-    CMD_MODEL_BOOMERANG,
+    CMD_MODEL_BOOMERANG,
     CMD_MODEL_BOOMERANGVALUES,
     CMD_MODEL_BOUNCE,
     CMD_MODEL_BOUNCEFACTOR,
@@ -352,7 +352,7 @@ typedef enum modelCommand
     CMD_MODEL_CREDIT,
     CMD_MODEL_CUSTBOMB,
     CMD_MODEL_CUSTENTITY,
-    CMD_MODEL_CUSTKNIFE,
+    CMD_MODEL_CUSTKNIFE,
     CMD_MODEL_CUSTBOOMERANG,
     CMD_MODEL_CUSTPBOMB,
     CMD_MODEL_CUSTPSHOT,
@@ -549,7 +549,7 @@ typedef enum modelCommand
     CMD_MODEL_SPAWNFRAME,
     CMD_MODEL_SPEED,
     CMD_MODEL_SPEEDF,
-    CMD_MODEL_STAR,
+    CMD_MODEL_STAR,
     CMD_MODEL_STAR_VELOCITY,
     CMD_MODEL_STATS,
     CMD_MODEL_STAYDOWN,