[Scummvm-git-logs] scummvm master -> b605eeb264dbcd0a5add344e37b1bc67f8e09817
OMGPizzaGuy
noreply at scummvm.org
Wed Jan 4 00:02:09 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b605eeb264 ULTIMA8: Clean up warning messages
Commit: b605eeb264dbcd0a5add344e37b1bc67f8e09817
https://github.com/scummvm/scummvm/commit/b605eeb264dbcd0a5add344e37b1bc67f8e09817
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-01-03T18:01:43-06:00
Commit Message:
ULTIMA8: Clean up warning messages
Changed paths:
engines/ultima/ultima8/convert/convert_shape.cpp
engines/ultima/ultima8/games/start_u8_process.cpp
engines/ultima/ultima8/gumps/item_relative_gump.cpp
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/heal_process.cpp
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/crosshair_process.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/world.cpp
diff --git a/engines/ultima/ultima8/convert/convert_shape.cpp b/engines/ultima/ultima8/convert/convert_shape.cpp
index 20101e64956..a88959b6791 100644
--- a/engines/ultima/ultima8/convert/convert_shape.cpp
+++ b/engines/ultima/ultima8/convert/convert_shape.cpp
@@ -59,7 +59,7 @@ void ConvertShape::Read(Common::SeekableReadStream &source, const ConvertShapeFo
source.read(ident, csf->_bytes_ident);
if (memcmp(ident, csf->_ident, csf->_bytes_ident)) {
- warning("Corrupt shape!");
+ warning("Corrupt shape");
return;
}
}
diff --git a/engines/ultima/ultima8/games/start_u8_process.cpp b/engines/ultima/ultima8/games/start_u8_process.cpp
index c369a179103..6b9ad8e147d 100644
--- a/engines/ultima/ultima8/games/start_u8_process.cpp
+++ b/engines/ultima/ultima8/games/start_u8_process.cpp
@@ -78,7 +78,7 @@ void StartU8Process::run() {
currentmap->areaSearch(&uclist, script, sizeof(script),
0, 256, false, 16188, 7500);
if (uclist.getSize() < 1) {
- warning("Unable to find FIRST egg!");
+ warning("Unable to find FIRST egg");
return;
}
@@ -99,7 +99,7 @@ void StartU8Process::run() {
0, 256, false, 11551, 2079);
if (uclist.getSize() < 1) {
- warning("Unable to find MUSIC egg!");
+ warning("Unable to find MUSIC egg");
} else {
ObjId objid = uclist.getuint16(0);
Item *musicEgg = getItem(objid);
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.cpp b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
index 13e1d3f8ad9..8a09da5faec 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.cpp
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.cpp
@@ -131,7 +131,7 @@ void ItemRelativeGump::GetItemLocation(int32 lerp_factor) {
gump = GetRootGump()->FindGump<GameMapGump>();
if (!gump) {
- warning("ItemRelativeGump::GetItemLocation(): Unable to find GameMapGump!");
+ warning("ItemRelativeGump::GetItemLocation(): Unable to find GameMapGump");
return;
}
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index a22dc8fd10d..85a8efcb4b9 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -1782,7 +1782,7 @@ void UCMachine::execProcess(UCProcess *p) {
above, below);
} else {
// return error or return empty list?
- warning("Warning: invalid item passed to surface search");
+ warning("Invalid item passed to surface search");
}
break;
}
@@ -1824,7 +1824,7 @@ void UCMachine::execProcess(UCProcess *p) {
si16a = static_cast<int16>(p->_stack.access2(sp + 4));
if (!itemlist) {
- warning("Invalid item list in loopnext!");
+ warning("Invalid item list in loopnext");
error = true;
break;
}
@@ -1983,7 +1983,7 @@ void UCMachine::execProcess(UCProcess *p) {
// end of function
// shouldn't happen
TRACE_OP("%s\tend", op_info);
- warning("end of function opcode %02X reached!", opcode);
+ warning("end of function opcode %02X reached", opcode);
error = true;
break;
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index 4b7e8cf6a54..22547606171 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -468,7 +468,7 @@ uint16 Actor::doAnim(Animation::Sequence anim, Direction dir, unsigned int steps
#if 0
if (!tryAnim(anim, dir)) {
- warning("Actor::doAnim: tryAnim = bad!");
+ warning("Actor::doAnim: tryAnim = bad");
}
#endif
diff --git a/engines/ultima/ultima8/world/actors/heal_process.cpp b/engines/ultima/ultima8/world/actors/heal_process.cpp
index 503ed837ad3..893c4dc6c8f 100644
--- a/engines/ultima/ultima8/world/actors/heal_process.cpp
+++ b/engines/ultima/ultima8/world/actors/heal_process.cpp
@@ -99,7 +99,7 @@ uint32 HealProcess::I_feedAvatar(const uint8 *args, unsigned int /*argsize*/) {
Process *p = Kernel::get_instance()->findProcess(0, 0x222); // CONSTANT!
HealProcess *hp = dynamic_cast<HealProcess *>(p);
if (!hp) {
- warning("I_feedAvatar: unable to find HealProcess!");
+ warning("I_feedAvatar: unable to find HealProcess");
return 0;
}
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index bb6a0f7f81a..be1b6ef448f 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -372,7 +372,7 @@ void MainActor::teleport(int mapNum, int32 x, int32 y, int32 z) {
// (attempt to) load the new map
if (!world->switchMap(mapNum)) {
- warning("MainActor::teleport(): switchMap(%d) failed!", mapNum);
+ warning("MainActor::teleport(): switchMap(%d) failed", mapNum);
return;
}
@@ -403,7 +403,7 @@ void MainActor::teleport(int mapNum, int teleport_id) {
// (attempt to) load the new map
if (!world->switchMap(mapNum)) {
- warning("MainActor::teleport(): switchMap() failed!");
+ warning("MainActor::teleport(): switchMap() failed");
setMapNum(oldmap);
return;
}
@@ -411,7 +411,7 @@ void MainActor::teleport(int mapNum, int teleport_id) {
// find destination
TeleportEgg *egg = currentmap->findDestination(teleport_id);
if (!egg) {
- warning("MainActor::teleport(): destination egg not found!");
+ warning("MainActor::teleport(): destination egg not found");
teleport(oldmap, oldx, oldy, oldz);
return;
}
diff --git a/engines/ultima/ultima8/world/crosshair_process.cpp b/engines/ultima/ultima8/world/crosshair_process.cpp
index a101626b6f6..a0090bef062 100644
--- a/engines/ultima/ultima8/world/crosshair_process.cpp
+++ b/engines/ultima/ultima8/world/crosshair_process.cpp
@@ -65,7 +65,7 @@ void CrosshairProcess::run() {
const CruAvatarMoverProcess *mover = dynamic_cast<CruAvatarMoverProcess *>(Ultima8Engine::get_instance()->getAvatarMoverProcess());
if (!mover) {
- warning("lost CruAvatarMoverProcess!");
+ warning("lost CruAvatarMoverProcess");
return;
}
double angle = mover->getAvatarAngleDegrees() + 90.0;
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index 50ceac23697..f886bb250f8 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -159,7 +159,7 @@ void Item::move(int32 X, int32 Y, int32 Z) {
int mapChunkSize = map->getChunkSize();
if (getObjId() == 1 && Z < 0) {
- warning("Warning: moving avatar below Z=0. (%d,%d,%d)\n", X, Y, Z);
+ warning("Moving avatar below Z=0. (%d,%d,%d)", X, Y, Z);
}
// TODO: In Crusader, if we are moving the avatar the game also checks whether
diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index 97902f727e8..6b27e98f7f8 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -151,7 +151,7 @@ bool World::switchMap(uint32 newmap) {
if (i->getFlags() & Item::FLG_ETHEREAL)
i->destroy();
else
- warning("Not destroying ethereal item %d - it doesn't think it's ethereal!", eth);
+ warning("Not destroying ethereal item %d - it doesn't think it's ethereal", eth);
}
}
More information about the Scummvm-git-logs
mailing list