Merge pull request #528 from tsoding/525

(#525) Make level_script functions static

diff --git a/src/game/level_script.c b/src/game/level_script.c
index af0ad9669cfddb4da3ded3260782e730c5fc2237..c1b242f3f985c1eae6028326c52498d967c219b4 100644 (file)
--- a/src/game/level_script.c
+++ b/src/game/level_script.c
@@ -8,7 +8,7 @@
 #include "level_script.h"
 #include "system/log.h"
 
-struct EvalResult
+static struct EvalResult
 hide_goal(void *param, Gc *gc, struct Scope *scope, struct Expr args)
 {
     assert(param);
@@ -28,7 +28,7 @@ hide_goal(void *param, Gc *gc, struct Scope *scope, struct Expr args)
     return eval_success(NIL(gc));
 }
 
-struct EvalResult
+static struct EvalResult
 show_goal(void *param, Gc *gc, struct Scope *scope, struct Expr args)
 {
     assert(param);
@@ -48,7 +48,8 @@ show_goal(void *param, Gc *gc, struct Scope *scope, struct Expr args)
     return eval_success(NIL(gc));
 }
 
-struct EvalResult rect_apply_force(void *param, Gc *gc, struct Scope *scope, struct Expr args)
+static struct EvalResult
+rect_apply_force(void *param, Gc *gc, struct Scope *scope, struct Expr args)
 {
     assert(gc);
     assert(scope);
@@ -76,7 +77,7 @@ struct EvalResult rect_apply_force(void *param, Gc *gc, struct Scope *scope, str
     return eval_success(NIL(gc));
 }
 
-struct EvalResult
+static struct EvalResult
 hide_label(void *param, Gc *gc, struct Scope *scope, struct Expr args)
 {
     assert(param);
@@ -89,7 +90,7 @@ hide_label(void *param, Gc *gc, struct Scope *scope, struct Expr args)
     return not_implemented(gc);
 }
 
-struct EvalResult
+static struct EvalResult
 show_label(void *param, Gc *gc, struct Scope *scope, struct Expr args)
 {
     assert(param);
@@ -102,7 +103,7 @@ show_label(void *param, Gc *gc, struct Scope *scope, struct Expr args)
     return not_implemented(gc);
 }
 
-struct EvalResult
+static struct EvalResult
 get_player_jump_count(void *param, Gc *gc, struct Scope *scope, struct Expr args)
 {
     assert(param);

diff --git a/src/game/level_script.h b/src/game/level_script.h
index 981de43e02cc12537c429c482053c3eb940bc206..b1fd08dc8733c0aedab84ff932944e778526e72b 100644 (file)
--- a/src/game/level_script.h
+++ b/src/game/level_script.h
@@ -7,26 +7,6 @@ typedef struct Gc Gc;
 struct Scope;
 typedef struct Level Level;
 
-// TODO(#525): Native lisp functions should probably have some kind of prefix
-
-struct EvalResult
-rect_apply_force(void *param, Gc *gc, struct Scope *scope, struct Expr args);
-
-struct EvalResult
-hide_goal(void *param, Gc *gc, struct Scope *scope, struct Expr args);
-
-struct EvalResult
-show_goal(void *param, Gc *gc, struct Scope *scope, struct Expr args);
-
-struct EvalResult
-hide_label(void *param, Gc *gc, struct Scope *scope, struct Expr args);
-
-struct EvalResult
-show_label(void *param, Gc *gc, struct Scope *scope, struct Expr args);
-
-struct EvalResult
-get_player_jump_count(void *param, Gc *gc, struct Scope *scope, struct Expr args);
-
 void load_level_library(Gc *gc, struct Scope *scope, Level *level);
 
 #endif  // LEVEL_SCRIPT_H_