From 56a99b1d378ce507c9c82b39abafbbb704a35c85 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 18 Feb 2014 02:34:23 +0100 Subject: PARALLACTION: Make GPL headers consistent in themselves. --- engines/parallaction/debug.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/parallaction/debug.cpp') diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index 4a8f8c71d7..1fea73a326 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- cgit v1.2.3 From daa8d57a866e2866369e432cf1d624179edc8875 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:07 +0200 Subject: ALL: Rename Debugger::DebugPrintf to Debugger::debugPrintf. --- engines/parallaction/debug.cpp | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'engines/parallaction/debug.cpp') diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index 1fea73a326..c5e694168e 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -81,7 +81,7 @@ bool Debugger::Cmd_Location(int argc, const char **argv) { break; case 1: - DebugPrintf("location [character name]\n"); + debugPrintf("location [character name]\n"); } @@ -90,13 +90,13 @@ bool Debugger::Cmd_Location(int argc, const char **argv) { bool Debugger::Cmd_Locations(int argc, const char **argv) { - DebugPrintf("+------------------------------+---------+\n" + debugPrintf("+------------------------------+---------+\n" "| location name | flags |\n" "+------------------------------+---------+\n"); for (uint i = 0; i < _vm->_numLocations; i++) { - DebugPrintf("|%-30s| %08x|\n", _vm->_locationNames[i], _vm->_localFlags[i]); + debugPrintf("|%-30s| %08x|\n", _vm->_locationNames[i], _vm->_localFlags[i]); } - DebugPrintf("+------------------------------+---------+\n"); + debugPrintf("+------------------------------+---------+\n"); return true; } @@ -105,14 +105,14 @@ bool Debugger::Cmd_GlobalFlags(int argc, const char **argv) { uint32 flags = g_globalFlags; - DebugPrintf("+------------------------------+---------+\n" + debugPrintf("+------------------------------+---------+\n" "| flag name | value |\n" "+------------------------------+---------+\n"); for (uint i = 0; i < _vm->_globalFlagsNames->count(); i++) { const char *value = ((flags & (1 << i)) == 0) ? "OFF" : "ON"; - DebugPrintf("|%-30s| %-6s|\n", _vm->_globalFlagsNames->item(i), value); + debugPrintf("|%-30s| %-6s|\n", _vm->_globalFlagsNames->item(i), value); } - DebugPrintf("+------------------------------+---------+\n"); + debugPrintf("+------------------------------+---------+\n"); return true; } @@ -125,7 +125,7 @@ bool Debugger::Cmd_ToggleGlobalFlag(int argc, const char **argv) { case 2: i = _vm->_globalFlagsNames->lookup(argv[1]); if (i == Table::notFound) { - DebugPrintf("invalid flag '%s'\n", argv[1]); + debugPrintf("invalid flag '%s'\n", argv[1]); } else { i--; if ((g_globalFlags & (1 << i)) == 0) @@ -136,7 +136,7 @@ bool Debugger::Cmd_ToggleGlobalFlag(int argc, const char **argv) { break; default: - DebugPrintf("toggleglobalflag \n"); + debugPrintf("toggleglobalflag \n"); } @@ -147,14 +147,14 @@ bool Debugger::Cmd_LocalFlags(int argc, const char **argv) { uint32 flags = _vm->getLocationFlags(); - DebugPrintf("+------------------------------+---------+\n" + debugPrintf("+------------------------------+---------+\n" "| flag name | value |\n" "+------------------------------+---------+\n"); for (uint i = 0; i < _vm->_localFlagNames->count(); i++) { const char *value = ((flags & (1 << i)) == 0) ? "OFF" : "ON"; - DebugPrintf("|%-30s| %-6s|\n", _vm->_localFlagNames->item(i), value); + debugPrintf("|%-30s| %-6s|\n", _vm->_localFlagNames->item(i), value); } - DebugPrintf("+------------------------------+---------+\n"); + debugPrintf("+------------------------------+---------+\n"); return true; } @@ -162,13 +162,13 @@ bool Debugger::Cmd_LocalFlags(int argc, const char **argv) { bool Debugger::Cmd_Give(int argc, const char **argv) { if (argc == 1) { - DebugPrintf("give \n"); + debugPrintf("give \n"); } else { int index = _vm->_objectsNames->lookup(argv[1]); if (index != Table::notFound) _vm->addInventoryItem(index + 4); else - DebugPrintf("invalid item name '%s'\n", argv[1]); + debugPrintf("invalid item name '%s'\n", argv[1]); } return true; @@ -181,15 +181,15 @@ bool Debugger::Cmd_Zones(int argc, const char **argv) { ZoneList::iterator e = _vm->_location._zones.end(); Common::Rect r; - DebugPrintf("+--------------------+---+---+---+---+--------+--------+\n" + debugPrintf("+--------------------+---+---+---+---+--------+--------+\n" "| name | l | t | r | b | type | flag |\n" "+--------------------+---+---+---+---+--------+--------+\n"); for ( ; b != e; ++b) { ZonePtr z = *b; z->getRect(r); - DebugPrintf("|%-20s|%3i|%3i|%3i|%3i|%8x|%8x|\n", z->_name, r.left, r.top, r.right, r.bottom, z->_type, z->_flags ); + debugPrintf("|%-20s|%3i|%3i|%3i|%3i|%8x|%8x|\n", z->_name, r.left, r.top, r.right, r.bottom, z->_type, z->_flags ); } - DebugPrintf("+--------------------+---+---+---+---+--------+--------+\n"); + debugPrintf("+--------------------+---+---+---+---+--------+--------+\n"); return true; @@ -260,15 +260,15 @@ bool Debugger::Cmd_Animations(int argc, const char **argv) { AnimationList::iterator e = _vm->_location._animations.end(); Common::String flags; - DebugPrintf("+--------------------+----+----+----+---+--------+----------------------------------------+\n" + debugPrintf("+--------------------+----+----+----+---+--------+----------------------------------------+\n" "| name | x | y | z | f | type | flags | \n" "+--------------------+----+----+----+---+--------+----------------------------------------+\n"); for ( ; b != e; ++b) { AnimationPtr a = *b; flags = decodeZoneFlags(a->_flags); - DebugPrintf("|%-20s|%4i|%4i|%4i|%3i|%8x|%-40s|\n", a->_name, a->getX(), a->getY(), a->getZ(), a->getF(), a->_type, flags.c_str() ); + debugPrintf("|%-20s|%4i|%4i|%4i|%3i|%8x|%-40s|\n", a->_name, a->getX(), a->getY(), a->getZ(), a->getF(), a->_type, flags.c_str() ); } - DebugPrintf("+--------------------+---+---+---+---+--------+----------------------------------------+\n"); + debugPrintf("+--------------------+---+---+---+---+--------+----------------------------------------+\n"); return true; @@ -278,7 +278,7 @@ bool Debugger::Cmd_GfxObjects(int argc, const char **argv) { const char *objType[] = { "DOOR", "GET", "ANIM" }; - DebugPrintf("+--------------------+-----+-----+-----+-----+-----+-------+-----+--------+\n" + debugPrintf("+--------------------+-----+-----+-----+-----+-----+-------+-----+--------+\n" "| name | x | y | w | h | z | layer | f | type |\n" "+--------------------+-----+-----+-----+-----+-----+-------+-----+--------+\n"); @@ -289,11 +289,11 @@ bool Debugger::Cmd_GfxObjects(int argc, const char **argv) { for ( ; b != e; ++b) { GfxObj *obj = *b; obj->getRect(obj->frame, r); - DebugPrintf("|%-20s|%5i|%5i|%5i|%5i|%5i|%7i|%5i|%8s|\n", obj->getName(), r.left, r.top, r.width(), r.height(), + debugPrintf("|%-20s|%5i|%5i|%5i|%5i|%5i|%7i|%5i|%8s|\n", obj->getName(), r.left, r.top, r.width(), r.height(), obj->z, obj->layer, obj->frame, objType[obj->type]); } - DebugPrintf("+--------------------+-----+-----+-----+-----+-----+-------+-----+--------+\n"); + debugPrintf("+--------------------+-----+-----+-----+-----+-----+-------+-----+--------+\n"); return true; } @@ -307,14 +307,14 @@ bool Debugger::Cmd_Programs(int argc, const char** argv) { int i = 1; - DebugPrintf("+---+--------------------+--------+----------+\n" + debugPrintf("+---+--------------------+--------+----------+\n" "| # | bound animation | size | status |\n" "+---+--------------------+--------+----------+\n"); for ( ; b != e; b++, i++) { ProgramPtr p = *b; - DebugPrintf("|%3i|%-20s|%8i|%-10s|\n", i, p->_anim->_name, p->_instructions.size(), status[p->_status] ); + debugPrintf("|%3i|%-20s|%8i|%-10s|\n", i, p->_anim->_name, p->_instructions.size(), status[p->_status] ); } - DebugPrintf("+---+--------------------+--------+----------+\n"); + debugPrintf("+---+--------------------+--------+----------+\n"); return true; } -- cgit v1.2.3 From ae4ffe01f0e4354938714c546034cd0f9806bfc3 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:08 +0200 Subject: ALL: Rename Debugger::DCmd_Register to Debugger::registerCmd. --- engines/parallaction/debug.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'engines/parallaction/debug.cpp') diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index c5e694168e..e4239eb786 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -33,18 +33,18 @@ Debugger::Debugger(Parallaction *vm) : GUI::Debugger() { _vm = vm; - DCmd_Register("continue", WRAP_METHOD(Debugger, Cmd_Exit)); - DCmd_Register("location", WRAP_METHOD(Debugger, Cmd_Location)); - DCmd_Register("give", WRAP_METHOD(Debugger, Cmd_Give)); - DCmd_Register("zones", WRAP_METHOD(Debugger, Cmd_Zones)); - DCmd_Register("animations", WRAP_METHOD(Debugger, Cmd_Animations)); - DCmd_Register("globalflags",WRAP_METHOD(Debugger, Cmd_GlobalFlags)); - DCmd_Register("toggleglobalflag",WRAP_METHOD(Debugger, Cmd_ToggleGlobalFlag)); - DCmd_Register("localflags", WRAP_METHOD(Debugger, Cmd_LocalFlags)); - DCmd_Register("locations", WRAP_METHOD(Debugger, Cmd_Locations)); - DCmd_Register("gfxobjects", WRAP_METHOD(Debugger, Cmd_GfxObjects)); - DCmd_Register("programs", WRAP_METHOD(Debugger, Cmd_Programs)); - DCmd_Register("showmouse", WRAP_METHOD(Debugger, Cmd_ShowMouse)); + registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); + registerCmd("location", WRAP_METHOD(Debugger, Cmd_Location)); + registerCmd("give", WRAP_METHOD(Debugger, Cmd_Give)); + registerCmd("zones", WRAP_METHOD(Debugger, Cmd_Zones)); + registerCmd("animations", WRAP_METHOD(Debugger, Cmd_Animations)); + registerCmd("globalflags",WRAP_METHOD(Debugger, Cmd_GlobalFlags)); + registerCmd("toggleglobalflag",WRAP_METHOD(Debugger, Cmd_ToggleGlobalFlag)); + registerCmd("localflags", WRAP_METHOD(Debugger, Cmd_LocalFlags)); + registerCmd("locations", WRAP_METHOD(Debugger, Cmd_Locations)); + registerCmd("gfxobjects", WRAP_METHOD(Debugger, Cmd_GfxObjects)); + registerCmd("programs", WRAP_METHOD(Debugger, Cmd_Programs)); + registerCmd("showmouse", WRAP_METHOD(Debugger, Cmd_ShowMouse)); } -- cgit v1.2.3 From 30d64edac449cde1f1c387b817ec33446ddd4698 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 27 May 2014 02:04:08 +0200 Subject: ALL: Make Debugger command function names conform to our guidelines. --- engines/parallaction/debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/parallaction/debug.cpp') diff --git a/engines/parallaction/debug.cpp b/engines/parallaction/debug.cpp index e4239eb786..a7087c64d7 100644 --- a/engines/parallaction/debug.cpp +++ b/engines/parallaction/debug.cpp @@ -33,7 +33,7 @@ Debugger::Debugger(Parallaction *vm) : GUI::Debugger() { _vm = vm; - registerCmd("continue", WRAP_METHOD(Debugger, Cmd_Exit)); + registerCmd("continue", WRAP_METHOD(Debugger, cmdExit)); registerCmd("location", WRAP_METHOD(Debugger, Cmd_Location)); registerCmd("give", WRAP_METHOD(Debugger, Cmd_Give)); registerCmd("zones", WRAP_METHOD(Debugger, Cmd_Zones)); -- cgit v1.2.3