--- a/src/variables.h Fri Jan 10 16:11:49 2014 +0200
+++ b/src/variables.h Fri Jan 10 21:58:42 2014 +0200
@@ -1,66 +1,27 @@
-/*
- * botc source code
- * Copyright (C) 2012 Santeri `Dusk` 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:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of the developer nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * 4. Redistributions in any form must be accompanied by information on how to
- * obtain complete source code for the software and any accompanying
- * software that uses the software. The source code must either be included
- * in the distribution or be available for no more than the cost of
- * distribution plus a nominal fee, and must be freely redistributable
- * under reasonable conditions. For an executable file, complete source
- * code means the source code for all modules it contains. It does not
- * include source code for modules or files that typically accompany the
- * major components of the operating system on which the executable file
- * runs.
- *
- * 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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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
-#ifndef __VARIABLES_H__
-#define __VARIABLES_H__
#include "str.h"
#include "scriptreader.h"
struct ScriptVar {
- str name;
- str statename;
+ string name;
+ string statename;
type_e type;
int value;
unsigned int index;
};
-extern array<ScriptVar> g_GlobalVariables;
-extern array<ScriptVar> g_LocalVariables;
+extern list<ScriptVar> g_GlobalVariables;
+extern list<ScriptVar> 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)
+ for (g = g_ScriptVariable; g != null; g = g->next)
-ScriptVar* DeclareGlobalVariable (ScriptReader* r, type_e type, str name);
+ScriptVar* DeclareGlobalVariable (ScriptReader* r, type_e type, string name);
deprecated unsigned int CountGlobalVars ();
-ScriptVar* FindGlobalVariable (str name);
+ScriptVar* FindGlobalVariable (string name);
-#endif // __VARIABLES_H__
\ No newline at end of file
+#endif // BOTC_VARIABLES_H
\ No newline at end of file