Mercurial > botc / file diff

--- a/src/variables.h	Fri Jan 10 21:58:42 2014 +0200
+++ b/src/variables.h	Sat Jan 11 22:36:31 2014 +0200
@@ -1,27 +1,59 @@
+/*
+	Copyright (c) 2013-2014, Santeri Piippo
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+		* Redistributions of source code must retain the above copyright
+		  notice, this list of conditions and the following disclaimer.
+
+		* Redistributions in binary form must reproduce the above copyright
+		  notice, this list of conditions and the following disclaimer in the
+		  documentation and/or other materials provided with the distribution.
+
+		* Neither the name of the <organization> nor the
+		  names of its contributors may be used to endorse or promote products
+		  derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+	DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 #ifndef BOTC_VARIABLES_H
 #define BOTC_VARIABLES_H
 
-#include "str.h"
-#include "scriptreader.h"
+#include "main.h"
 
-struct ScriptVar {
+class botscript_parser;
+
+struct script_variable
+{
 	string name;
 	string statename;
 	type_e type;
 	int value;
-	unsigned int index;
+	int index;
 };
 
-extern list<ScriptVar> g_GlobalVariables;
-extern list<ScriptVar> g_LocalVariables;
+extern list<script_variable> g_GlobalVariables;
+extern list<script_variable> g_LocalVariables;
 
 #define ITERATE_GLOBAL_VARS(u) \
 	for (u = 0; u < MAX_SCRIPT_VARIABLES; u++)
 #define ITERATE_SCRIPT_VARS(g) \
 	for (g = g_ScriptVariable; g != null; g = g->next)
 
-ScriptVar* DeclareGlobalVariable (ScriptReader* r, type_e type, string name);
-deprecated unsigned int CountGlobalVars ();
-ScriptVar* FindGlobalVariable (string name);
+script_variable* DeclareGlobalVariable (botscript_parser* r, type_e type, string name);
+deprecated int CountGlobalVars ();
+script_variable* FindGlobalVariable (string name);
 
-#endif // BOTC_VARIABLES_H
\ No newline at end of file
+#endif // BOTC_VARIABLES_H