diff options
Diffstat (limited to 'engines/wintermute/base/scriptables')
-rw-r--r-- | engines/wintermute/base/scriptables/script.cpp (renamed from engines/wintermute/base/scriptables/ScScript.cpp) | 10 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script.h (renamed from engines/wintermute/base/scriptables/ScScript.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp (renamed from engines/wintermute/base/scriptables/ScEngine.cpp) | 20 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_engine.h (renamed from engines/wintermute/base/scriptables/ScEngine.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_array.cpp (renamed from engines/wintermute/base/scriptables/SXArray.cpp) | 8 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_array.h (renamed from engines/wintermute/base/scriptables/SXArray.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.cpp (renamed from engines/wintermute/base/scriptables/SXDate.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_date.h (renamed from engines/wintermute/base/scriptables/SXDate.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_file.cpp (renamed from engines/wintermute/base/scriptables/SXFile.cpp) | 18 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_file.h (renamed from engines/wintermute/base/scriptables/SXFile.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.cpp (renamed from engines/wintermute/base/scriptables/SXMath.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_math.h (renamed from engines/wintermute/base/scriptables/SXMath.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp (renamed from engines/wintermute/base/scriptables/SXMemBuffer.cpp) | 10 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_mem_buffer.h (renamed from engines/wintermute/base/scriptables/SXMemBuffer.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_object.cpp (renamed from engines/wintermute/base/scriptables/SxObject.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_object.h (renamed from engines/wintermute/base/scriptables/SxObject.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_string.cpp (renamed from engines/wintermute/base/scriptables/SXString.cpp) | 12 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_ext_string.h (renamed from engines/wintermute/base/scriptables/SXString.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_stack.cpp (renamed from engines/wintermute/base/scriptables/ScStack.cpp) | 6 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_stack.h (renamed from engines/wintermute/base/scriptables/ScStack.h) | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_value.cpp (renamed from engines/wintermute/base/scriptables/ScValue.cpp) | 12 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_value.h (renamed from engines/wintermute/base/scriptables/ScValue.h) | 2 |
22 files changed, 68 insertions, 68 deletions
diff --git a/engines/wintermute/base/scriptables/ScScript.cpp b/engines/wintermute/base/scriptables/script.cpp index 0b5b3c24bf..a9646e0045 100644 --- a/engines/wintermute/base/scriptables/ScScript.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -27,11 +27,11 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
#include "common/memstream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScScript.h b/engines/wintermute/base/scriptables/script.h index c031f8186f..899e1f3098 100644 --- a/engines/wintermute/base/scriptables/ScScript.h +++ b/engines/wintermute/base/scriptables/script.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCSCRIPT_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/dcscript.h" // Added by ClassView
#include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/scriptables/ScEngine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index db79a7d0e9..387093ac4a 100644 --- a/engines/wintermute/base/scriptables/ScEngine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -27,16 +27,16 @@ */
#include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/scriptables/ScEngine.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/BRegistry.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/BSound.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/script_engine.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/base_registry.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/sound/base_sound.h"
+#include "engines/wintermute/base/base_file_manager.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScEngine.h b/engines/wintermute/base/scriptables/script_engine.h index 0322319b3d..81dc13a73c 100644 --- a/engines/wintermute/base/scriptables/ScEngine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -31,7 +31,7 @@ #include "engines/wintermute/persistent.h"
#include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/wme_debugger.h"
#include "engines/wintermute/utils/utils.h"
#include "engines/wintermute/platform_osystem.h"
diff --git a/engines/wintermute/base/scriptables/SXArray.cpp b/engines/wintermute/base/scriptables/script_ext_array.cpp index 425118a3e7..a1b8249cb1 100644 --- a/engines/wintermute/base/scriptables/SXArray.cpp +++ b/engines/wintermute/base/scriptables/script_ext_array.cpp @@ -27,10 +27,10 @@ */
#include "engines/wintermute/persistent.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/system/SysInstance.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/system/sys_instance.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXArray.h b/engines/wintermute/base/scriptables/script_ext_array.h index 0f46bd546e..b873416572 100644 --- a/engines/wintermute/base/scriptables/SXArray.h +++ b/engines/wintermute/base/scriptables/script_ext_array.h @@ -29,7 +29,7 @@ #ifndef WINTERMUTE_SXARRAY_H
#define WINTERMUTE_SXARRAY_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXDate.cpp b/engines/wintermute/base/scriptables/script_ext_date.cpp index cd705cc9d4..211c0d34f0 100644 --- a/engines/wintermute/base/scriptables/SXDate.cpp +++ b/engines/wintermute/base/scriptables/script_ext_date.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXDate.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_date.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXDate.h b/engines/wintermute/base/scriptables/script_ext_date.h index df0641983f..82f6af1f1d 100644 --- a/engines/wintermute/base/scriptables/SXDate.h +++ b/engines/wintermute/base/scriptables/script_ext_date.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXDATE_H
#include "common/system.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXFile.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 1924a42d72..58c0416b43 100644 --- a/engines/wintermute/base/scriptables/SXFile.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -26,17 +26,17 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/system/SysClassRegistry.h"
-#include "engines/wintermute/system/SysClass.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/system/sys_class_registry.h"
+#include "engines/wintermute/system/sys_class.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/file/BFile.h"
-#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/file/base_file.h"
+#include "engines/wintermute/base/base_file_manager.h"
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/scriptables/SXFile.h"
+#include "engines/wintermute/base/scriptables/script_ext_file.h"
// Note: This code is completely untested, as I have yet to find a game that uses SXFile.
diff --git a/engines/wintermute/base/scriptables/SXFile.h b/engines/wintermute/base/scriptables/script_ext_file.h index 709d1f4378..5a6811fe57 100644 --- a/engines/wintermute/base/scriptables/SXFile.h +++ b/engines/wintermute/base/scriptables/script_ext_file.h @@ -30,7 +30,7 @@ #define WINTERMUTES_SXFILE_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
#include "common/stream.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMath.cpp b/engines/wintermute/base/scriptables/script_ext_math.cpp index fb2838ee94..22b08087b7 100644 --- a/engines/wintermute/base/scriptables/SXMath.cpp +++ b/engines/wintermute/base/scriptables/script_ext_math.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/SXMath.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/script_ext_math.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/persistent.h"
#include "common/math.h"
#include <cmath>
diff --git a/engines/wintermute/base/scriptables/SXMath.h b/engines/wintermute/base/scriptables/script_ext_math.h index 4389de611f..422521233f 100644 --- a/engines/wintermute/base/scriptables/SXMath.h +++ b/engines/wintermute/base/scriptables/script_ext_math.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXMATH_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index 9ac98ab11d..df2bf188ff 100644 --- a/engines/wintermute/base/scriptables/SXMemBuffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -26,11 +26,11 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BScriptable.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
+#include "engines/wintermute/base/base_scriptable.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_ext_mem_buffer.h"
#include "common/file.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXMemBuffer.h b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h index 09831bf464..a9d78e50e4 100644 --- a/engines/wintermute/base/scriptables/SXMemBuffer.h +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXMEMBUFFER_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SxObject.cpp b/engines/wintermute/base/scriptables/script_ext_object.cpp index ba961ed2ae..cb0d32d1a3 100644 --- a/engines/wintermute/base/scriptables/SxObject.cpp +++ b/engines/wintermute/base/scriptables/script_ext_object.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "SxObject.h"
-#include "ScValue.h"
-#include "ScStack.h"
+#include "engines/wintermute/base/scriptables/script_ext_object.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SxObject.h b/engines/wintermute/base/scriptables/script_ext_object.h index b4ec7c6cde..b4e869d5b3 100644 --- a/engines/wintermute/base/scriptables/SxObject.h +++ b/engines/wintermute/base/scriptables/script_ext_object.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXOBJECT_H
-#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/base_object.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index ed3d243cb0..bd7541fadd 100644 --- a/engines/wintermute/base/scriptables/SXString.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -26,13 +26,13 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
#include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/base/scriptables/SXString.h"
-#include "engines/wintermute/base/scriptables/SXArray.h"
-#include "engines/wintermute/utils/StringUtil.h"
+#include "engines/wintermute/base/scriptables/script_ext_string.h"
+#include "engines/wintermute/base/scriptables/script_ext_array.h"
+#include "engines/wintermute/utils/string_util.h"
#include "common/tokenizer.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/SXString.h b/engines/wintermute/base/scriptables/script_ext_string.h index 348595ad29..52a1524dde 100644 --- a/engines/wintermute/base/scriptables/SXString.h +++ b/engines/wintermute/base/scriptables/script_ext_string.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SXSTRING_H
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScStack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 252cd21dda..188cb2d15c 100644 --- a/engines/wintermute/base/scriptables/ScStack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -26,9 +26,9 @@ * Copyright (c) 2011 Jan Nedoma
*/
-#include "engines/wintermute/base/scriptables/ScStack.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/script_stack.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/base_game.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScStack.h b/engines/wintermute/base/scriptables/script_stack.h index 22dae63060..6460f901fe 100644 --- a/engines/wintermute/base/scriptables/ScStack.h +++ b/engines/wintermute/base/scriptables/script_stack.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCSTACK_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
diff --git a/engines/wintermute/base/scriptables/ScValue.cpp b/engines/wintermute/base/scriptables/script_value.cpp index f38a12fc7a..da47ed299f 100644 --- a/engines/wintermute/base/scriptables/ScValue.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -27,12 +27,12 @@ */
#include "engines/wintermute/platform_osystem.h"
-#include "engines/wintermute/base/BDynBuffer.h"
-#include "engines/wintermute/base/BGame.h"
-#include "engines/wintermute/base/scriptables/ScValue.h"
-#include "engines/wintermute/base/scriptables/ScScript.h"
-#include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/base_dynamic_buffer.h"
+#include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/scriptables/script_value.h"
+#include "engines/wintermute/base/scriptables/script.h"
+#include "engines/wintermute/utils/string_util.h"
+#include "engines/wintermute/base/base_scriptable.h"
namespace WinterMute {
diff --git a/engines/wintermute/base/scriptables/ScValue.h b/engines/wintermute/base/scriptables/script_value.h index c66a60c22a..eaee3ed773 100644 --- a/engines/wintermute/base/scriptables/ScValue.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -30,7 +30,7 @@ #define WINTERMUTE_SCVALUE_H
-#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/base.h"
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/dcscript.h" // Added by ClassView
#include "engines/wintermute/wme_debugger.h"
|