WINTERMUTE: var_name -> varName

3 files changed, 21 insertions, 21 deletions

diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 9cce8ca9ee..ee876f2503 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -341,7 +341,7 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) {
 	buffer = (byte *)params;

 

 	int widths[300];

-	int num = 0, default_width = 8;

+	int num = 0, defaultWidth = 8;

 	int lastWidth = 0;

 	int i;

 	int r = 255, g = 255, b = 255;

@@ -377,7 +377,7 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) {
 			break;

 

 		case TOKEN_DEFAULT_WIDTH:

-			parser.scanStr(params, "%d", &default_width);

+			parser.scanStr(params, "%d", &defaultWidth);

 			break;

 

 		case TOKEN_WIDTHS_FRAME:

@@ -482,7 +482,7 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) {
 		}

 	} else {

 		for (i = lastWidth; i < NUM_CHARACTERS; i++) {

-			_widths[i] = default_width;

+			_widths[i] = defaultWidth;

 		}

 	}

 

diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index 4deeb0bf39..54a04c454f 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -106,12 +106,12 @@ void ScScript::readHeader() {
 	_scriptStream->seek(0);

 	_header.magic = _scriptStream->readUint32LE();

 	_header.version = _scriptStream->readUint32LE();

-	_header.code_start = _scriptStream->readUint32LE();

-	_header.func_table = _scriptStream->readUint32LE();

-	_header.symbol_table = _scriptStream->readUint32LE();

-	_header.event_table = _scriptStream->readUint32LE();

-	_header.externals_table = _scriptStream->readUint32LE();

-	_header.method_table = _scriptStream->readUint32LE();

+	_header.codeStart = _scriptStream->readUint32LE();

+	_header.funcTable = _scriptStream->readUint32LE();

+	_header.symbolTable = _scriptStream->readUint32LE();

+	_header.eventTable = _scriptStream->readUint32LE();

+	_header.externalsTable = _scriptStream->readUint32LE();

+	_header.methodTable = _scriptStream->readUint32LE();

 	_scriptStream->seek(oldPos);

 }

 

@@ -148,7 +148,7 @@ bool ScScript::initScript() {
 

 

 	// skip to the beginning

-	_iP = _header.code_start;

+	_iP = _header.codeStart;

 	_scriptStream->seek(_iP);

 	_currentLine = 0;

 

@@ -169,7 +169,7 @@ bool ScScript::initTables() {
 

 	readHeader();

 	// load symbol table

-	_iP = _header.symbol_table;

+	_iP = _header.symbolTable;

 

 	_numSymbols = getDWORD();

 	_symbols = new char*[_numSymbols];

@@ -179,7 +179,7 @@ bool ScScript::initTables() {
 	}

 

 	// load functions table

-	_iP = _header.func_table;

+	_iP = _header.funcTable;

 

 	_numFunctions = getDWORD();

 	_functions = new TFunctionPos[_numFunctions];

@@ -190,7 +190,7 @@ bool ScScript::initTables() {
 

 

 	// load events table

-	_iP = _header.event_table;

+	_iP = _header.eventTable;

 

 	_numEvents = getDWORD();

 	_events = new TEventPos[_numEvents];

@@ -202,7 +202,7 @@ bool ScScript::initTables() {
 

 	// load externals

 	if (_header.version >= 0x0101) {

-		_iP = _header.externals_table;

+		_iP = _header.externalsTable;

 

 		_numExternals = getDWORD();

 		_externals = new TExternalFunction[_numExternals];

@@ -222,7 +222,7 @@ bool ScScript::initTables() {
 	}

 

 	// load method table

-	_iP = _header.method_table;

+	_iP = _header.methodTable;

 

 	_numMethods = getDWORD();

 	_methods = new TMethodPos[_numMethods];

diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h
index c343ad24ad..2ee1319acb 100644
--- a/engines/wintermute/base/scriptables/script.h
+++ b/engines/wintermute/base/scriptables/script.h
@@ -88,12 +88,12 @@ public:
 	typedef struct {

 		uint32 magic;

 		uint32 version;

-		uint32 code_start;

-		uint32 func_table;

-		uint32 symbol_table;

-		uint32 event_table;

-		uint32 externals_table;

-		uint32 method_table;

+		uint32 codeStart;

+		uint32 funcTable;

+		uint32 symbolTable;

+		uint32 eventTable;

+		uint32 externalsTable;

+		uint32 methodTable;

 	} TScriptHeader;

 

 	TScriptHeader _header;