[Scummvm-git-logs] scummvm master -> 49cfdf11227f5793cd742604eb62fa4fd34462c4
bluegr
noreply at scummvm.org
Sun Aug 25 20:38:24 UTC 2024
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:
49cfdf1122 JANITORIAL: ICB: Fix typos in warning, debug, error and message box dialogues
Commit: 49cfdf11227f5793cd742604eb62fa4fd34462c4
https://github.com/scummvm/scummvm/commit/49cfdf11227f5793cd742604eb62fa4fd34462c4
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-08-25T23:38:20+03:00
Commit Message:
JANITORIAL: ICB: Fix typos in warning, debug, error and message box dialogues
Changed paths:
engines/icb/animation.cpp
engines/icb/animation_mega_set.cpp
engines/icb/barriers.cpp
engines/icb/camera.cpp
engines/icb/chi.cpp
engines/icb/floors.h
engines/icb/fn_animation.cpp
engines/icb/fn_interact.cpp
engines/icb/footstep.cpp
engines/icb/function.cpp
engines/icb/general_interaction.cpp
engines/icb/general_npc_animation.cpp
engines/icb/logic.cpp
engines/icb/mega_interaction.cpp
engines/icb/player.cpp
engines/icb/player_interaction.cpp
engines/icb/route_manager.cpp
engines/icb/session.cpp
engines/icb/speech.cpp
engines/icb/stagedraw_pc_poly.cpp
diff --git a/engines/icb/animation.cpp b/engines/icb/animation.cpp
index f8300bfa79f..bb276d6b8e9 100644
--- a/engines/icb/animation.cpp
+++ b/engines/icb/animation.cpp
@@ -121,7 +121,7 @@ mcodeFunctionReturnCodes _game_session::fn_prop_animate(int32 &, int32 *params)
}
// didn't find the named anim so that's it
- Tdebug("objects_that_died.txt", "_game_session::fn_prop_animate object %s cant find anim %s", CGameObject::GetName(object), anim_name);
+ Tdebug("objects_that_died.txt", "_game_session::fn_prop_animate object %s can't find anim %s", CGameObject::GetName(object), anim_name);
Shut_down_object("by fn_prop_animate");
return (IR_STOP);
}
@@ -151,7 +151,7 @@ mcodeFunctionReturnCodes _game_session::fn_prop_set_to_last_frame(int32 &, int32
}
// didn't find the named anim so that's it
- Tdebug("objects_that_died.txt", "fn_prop_set_to_last_frame object %s cant find anim %s", CGameObject::GetName(object), anim_name);
+ Tdebug("objects_that_died.txt", "fn_prop_set_to_last_frame object %s can't find anim %s", CGameObject::GetName(object), anim_name);
Shut_down_object("by fn_prop_set_to_last_frame");
return (IR_REPEAT);
@@ -181,8 +181,8 @@ mcodeFunctionReturnCodes _game_session::fn_prop_set_to_first_frame(int32 &, int3
}
// didn't find the named anim so that's it
- Tdebug("objects_that_died.txt", "fn_prop_set_to_first_frame object %s cant find anim %s", CGameObject::GetName(object), anim_name);
- Message_box("fn_prop_set_to_first_frame object %s cant find anim %s", CGameObject::GetName(object), anim_name);
+ Tdebug("objects_that_died.txt", "fn_prop_set_to_first_frame object %s can't find anim %s", CGameObject::GetName(object), anim_name);
+ Message_box("fn_prop_set_to_first_frame object %s can't find anim %s", CGameObject::GetName(object), anim_name);
Shut_down_object("by fn_prop_set_to_first_frame");
return (IR_REPEAT);
}
@@ -218,7 +218,7 @@ mcodeFunctionReturnCodes _game_session::fn_test_prop_anim(int32 &result, int32 *
}
}
- Message_box("fn_test_prop_anim didnt find anim [%s] for object [%s]", anim_name, CGameObject::GetName(object));
+ Message_box("fn_test_prop_anim didn't find anim [%s] for object [%s]", anim_name, CGameObject::GetName(object));
result = 0;
@@ -251,7 +251,7 @@ uint32 _game_session::Validate_prop_anim(const char *anim_name) {
}
}
- Fatal_error("Validate_prop_anim didnt find anim [%s] for object [%s]", anim_name, CGameObject::GetName(object));
+ Fatal_error("Validate_prop_anim didn't find anim [%s] for object [%s]", anim_name, CGameObject::GetName(object));
return (FALSE8);
}
@@ -345,7 +345,7 @@ mcodeFunctionReturnCodes _game_session::fn_inherit_prop_anim_height_id(int32 &,
}
// didn't find the named anim so that's it
- Fatal_error("fn_inherit_prop_anim_height_id object [%s] prop [%s] cant find anim [%s]", CGameObject::GetName(object), LinkedDataObject::Fetch_items_name_by_number(objects, params[0]), anim_name);
+ Fatal_error("fn_inherit_prop_anim_height_id object [%s] prop [%s] can't find anim [%s]", CGameObject::GetName(object), LinkedDataObject::Fetch_items_name_by_number(objects, params[0]), anim_name);
return (IR_STOP);
}
@@ -436,7 +436,7 @@ mcodeFunctionReturnCodes _game_session::fn_inherit_prop_anim_height(int32 &, int
}
// didn't find the named anim so that's it
- Fatal_error("fn_inherit_prop_anim_height object [%s] prop [%s] cant find anim [%s]", CGameObject::GetName(object), prop_name, anim_name);
+ Fatal_error("fn_inherit_prop_anim_height object [%s] prop [%s] can't find anim [%s]", CGameObject::GetName(object), prop_name, anim_name);
return (IR_STOP); //
}
diff --git a/engines/icb/animation_mega_set.cpp b/engines/icb/animation_mega_set.cpp
index 26c0ce8ca6e..d2893a85d49 100644
--- a/engines/icb/animation_mega_set.cpp
+++ b/engines/icb/animation_mega_set.cpp
@@ -394,12 +394,12 @@ __mega_set_names _game_session::Fetch_generic_anim_from_ascii(const char *ascii_
if (!strcmp(const_cast<char *>(ascii_name), master_anim_name_table[k].name)) {
// found!
if (I->IsAnimTable(L->cur_anim_type) == (int8)-1)
- Fatal_error("Fetch_generic_anim_from_ascii cant find on drive %s", ascii_name);
+ Fatal_error("Fetch_generic_anim_from_ascii can't find on drive %s", ascii_name);
return (master_anim_name_table[k].ref);
}
}
- Fatal_error("Fetch_generic_anim_from_ascii cant find %s", ascii_name);
+ Fatal_error("Fetch_generic_anim_from_ascii can't find %s", ascii_name);
return __NON_GENERIC;
}
diff --git a/engines/icb/barriers.cpp b/engines/icb/barriers.cpp
index 6320734a564..705fc870e0f 100644
--- a/engines/icb/barriers.cpp
+++ b/engines/icb/barriers.cpp
@@ -1165,7 +1165,7 @@ void _barrier_handler::Prepare_animating_barriers() {
if (!anim_slices[cur_slice].anim_parents[f]) {
anim_slices[cur_slice].anim_parents[f] = &anim_parent_table[parents_used++];
- Tdebug("anim_barriers.txt", " new aparent");
+ Tdebug("anim_barriers.txt", " new parent");
}
pbar_num = anim_slices[cur_slice].anim_parents[f]->num_props;
diff --git a/engines/icb/camera.cpp b/engines/icb/camera.cpp
index 59f58b368fa..36b6b2eafad 100644
--- a/engines/icb/camera.cpp
+++ b/engines/icb/camera.cpp
@@ -73,11 +73,11 @@ mcodeFunctionReturnCodes _game_session::fn_floor_and_floor_camera_linked(int32 &
home_floor_num = floor_def->Fetch_floor_number_by_name(home_floor_name);
if (home_floor_num == PX_LINKED_DATA_FILE_ERROR)
- Fatal_error("fn_floor_and_floor_camera_linked cant find floor [%s]", home_floor_name);
+ Fatal_error("fn_floor_and_floor_camera_linked can't find floor [%s]", home_floor_name);
floor_num = floor_def->Fetch_floor_number_by_name(floor_name);
if (floor_num == PX_LINKED_DATA_FILE_ERROR)
- Fatal_error("fn_floor_and_floor_camera_linked cant find floor [%s]", floor_name);
+ Fatal_error("fn_floor_and_floor_camera_linked can't find floor [%s]", floor_name);
if (home_floor_num == floor_num)
Fatal_error("fn_floor_and_floor_camera_linked finds [%s] and [%s] are same floor!", home_floor_name, floor_name);
@@ -393,10 +393,10 @@ void _game_session::Prepare_camera_floors() {
// get a mega class objects world position - can be player or other mega
if (!g_mission->camera_follow_id_overide) {
if (!player.Player_exists())
- Fatal_error("camera director cant choose a scene as player object has been shut down");
+ Fatal_error("camera director can't choose a scene as player object has been shut down");
if (logic_structs[player.Fetch_player_id()]->ob_status == OB_STATUS_HELD)
- Fatal_error("camera director cant choose a scene as player object has been shut down");
+ Fatal_error("camera director can't choose a scene as player object has been shut down");
posi = (PXvector *)&logic_structs[player.Fetch_player_id()]->mega->actor_xyz;
diff --git a/engines/icb/chi.cpp b/engines/icb/chi.cpp
index d4740317e65..e20ce528597 100644
--- a/engines/icb/chi.cpp
+++ b/engines/icb/chi.cpp
@@ -594,7 +594,7 @@ bool8 _game_session::Process_chi() {
if (!res) { // no interaction portal for chi - actually not possible now she can use the normal
// 'interact' script
chi_think_mode = __LOST; // oh dear, we must be lost. Not legal but lets handle it for now
- Tdebug("chi.txt", "chi cant follow player via %d", history[next_room].id);
+ Tdebug("chi.txt", "chi can't follow player via %d", history[next_room].id);
return TRUE8;
} else {
// ok, back to script
diff --git a/engines/icb/floors.h b/engines/icb/floors.h
index 404695ab42e..612eacdab4d 100644
--- a/engines/icb/floors.h
+++ b/engines/icb/floors.h
@@ -92,7 +92,7 @@ inline PXreal _floor_world::Fetch_floors_volume_height(uint32 num) { return floo
inline PXreal _floor_world::Fetch_height(uint32 height) {
if (height >= total_heights) {
- Fatal_error("cant get %d height of %d", height, total_heights);
+ Fatal_error("can't get %d height of %d", height, total_heights);
}
return (heights[height]);
diff --git a/engines/icb/fn_animation.cpp b/engines/icb/fn_animation.cpp
index b0fb3e12dc4..8900a59e817 100644
--- a/engines/icb/fn_animation.cpp
+++ b/engines/icb/fn_animation.cpp
@@ -531,7 +531,7 @@ mcodeFunctionReturnCodes _game_session::fn_snap_face_object(int32 &, int32 *para
uint32 id = LinkedDataObject::Fetch_item_number_by_name(objects, object_name);
if (id == 0xffffffff)
- Fatal_error("fn_snap_face_object cant find target object %s", object_name);
+ Fatal_error("fn_snap_face_object can't find target object %s", object_name);
log = Fetch_object_struct(id);
@@ -1489,7 +1489,7 @@ mcodeFunctionReturnCodes _game_session::fn_apply_anim_y(int32 &, int32 *params)
}
}
- Fatal_error("fn_apply_anim_y [%s] cant find generic anim [%s]", CGameObject::GetName(object), anim_name);
+ Fatal_error("fn_apply_anim_y [%s] can't find generic anim [%s]", CGameObject::GetName(object), anim_name);
return IR_CONT;
}
@@ -1500,7 +1500,7 @@ mcodeFunctionReturnCodes _game_session::fn_add_y(int32 &, int32 *params) {
// params 0 value
if (L->image_type == PROP)
- Fatal_error("fn_add_y cant be used on a prop - %s", CGameObject::GetName(object));
+ Fatal_error("fn_add_y can't be used on a prop - %s", CGameObject::GetName(object));
M->actor_xyz.y += params[0];
diff --git a/engines/icb/fn_interact.cpp b/engines/icb/fn_interact.cpp
index b26dc9eb82c..da470fb0ae0 100644
--- a/engines/icb/fn_interact.cpp
+++ b/engines/icb/fn_interact.cpp
@@ -278,10 +278,10 @@ mcodeFunctionReturnCodes _game_session::Core_prop_interact(int32 & /*result*/, i
// get anim type
res = I->Find_anim_type(&anim, anim_name);
if (!res)
- Fatal_error("Core_prop_interact cant indentify animation %s", anim_name);
+ Fatal_error("Core_prop_interact can't indentify animation %s", anim_name);
if (!I->IsAnimTable(anim))
- Fatal_error("Core_prop_interact finds [%s] doesnt have a [%s] animation", CGameObject::GetName(object), params[0]);
+ Fatal_error("Core_prop_interact finds [%s] doesn't have a [%s] animation", CGameObject::GetName(object), params[0]);
} else {
Zdebug("calc *custom* target anim [%s]", anim_name);
I->Init_custom_animation(anim_name);
@@ -544,7 +544,7 @@ mcodeFunctionReturnCodes _game_session::fn_unregister_for_auto_interaction(int32
}
}
- Fatal_error("fn_unregister_for_auto_interaction cant unregister non registered object [%s]", CGameObject::GetName(object));
+ Fatal_error("fn_unregister_for_auto_interaction can't unregister non registered object [%s]", CGameObject::GetName(object));
return IR_CONT;
}
diff --git a/engines/icb/footstep.cpp b/engines/icb/footstep.cpp
index 601fa073019..3c9c99bb719 100644
--- a/engines/icb/footstep.cpp
+++ b/engines/icb/footstep.cpp
@@ -88,11 +88,11 @@ mcodeFunctionReturnCodes _game_session::fn_set_footstep_weight(int32 &, int32 *p
// check must be mega
if (!M)
- Fatal_error("Cant set footstep weight for non-mega %s\n", L->GetName());
+ Fatal_error("Can't set footstep weight for non-mega %s\n", L->GetName());
// check allow
if ((w < 0) || (w > 200))
- Fatal_error("Cant set %s footstep weight to %d, allowed range is 0-200%%", L->GetName(), w);
+ Fatal_error("Can't set %s footstep weight to %d, allowed range is 0-200%%", L->GetName(), w);
M->footstep_weight = (uint8)w;
@@ -105,7 +105,7 @@ mcodeFunctionReturnCodes _game_session::fn_set_special_footstep(int32 &, int32 *
// error checking
// must be mega
if (!M)
- Fatal_error("Cant set special footsteps for non-mega %s\n", L->GetName());
+ Fatal_error("Can't set special footsteps for non-mega %s\n", L->GetName());
// must have special footstep set
if ((specialFootSfx == 0) && (params[0]))
diff --git a/engines/icb/function.cpp b/engines/icb/function.cpp
index 22258952131..e36ddaf3e05 100644
--- a/engines/icb/function.cpp
+++ b/engines/icb/function.cpp
@@ -592,7 +592,7 @@ mcodeFunctionReturnCodes _game_session::fn_init_from_marker_file(int32 &, int32
start_pos = (_map_marker *)markers.Fetch_marker_by_object_name(const_cast<char *>(CGameObject::GetName(object)));
if (!start_pos) {
- Message_box("fn_init_from_marker_file missing map marker file entry for item %s. You must edit the markers - dont play the game.", CGameObject::GetName(object));
+ Message_box("fn_init_from_marker_file missing map marker file entry for item %s. You must edit the markers - don't play the game.", CGameObject::GetName(object));
Shut_down_object("fn_init_from_marker_file");
return IR_STOP;
}
@@ -907,7 +907,7 @@ bool8 _game_session::Call_socket(uint32 id, const char *script, int32 *retval) {
// get target object
socket_object = (CGame *)LinkedDataObject::Fetch_item_by_number(MS->objects, id);
if (!socket_object)
- Fatal_error("internal Call_socket - named object dont exist");
+ Fatal_error("internal Call_socket - named object don't exist");
Zdebug("\nCall_socket - obj %s, script %s", CGameObject::GetName(socket_object), script);
diff --git a/engines/icb/general_interaction.cpp b/engines/icb/general_interaction.cpp
index 02e5dd5573c..ea4bc071ac1 100644
--- a/engines/icb/general_interaction.cpp
+++ b/engines/icb/general_interaction.cpp
@@ -52,7 +52,7 @@ bool8 _game_session::Find_interact_marker_in_anim(__mega_set_names animation, PX
// first check anim file will exist
if (!I->IsAnimTable(animation))
- Fatal_error("Find_interact_marker_in_anim finds [%s] doesnt have a [%s] animation", CGameObject::GetName(object), master_anim_name_table[animation].name);
+ Fatal_error("Find_interact_marker_in_anim finds [%s] doesn't have a [%s] animation", CGameObject::GetName(object), master_anim_name_table[animation].name);
// open the file
PXanim *pAnim = (PXanim *)rs_anims->Res_open(I->get_info_name(animation), I->info_name_hash[animation], I->base_path, I->base_path_hash);
diff --git a/engines/icb/general_npc_animation.cpp b/engines/icb/general_npc_animation.cpp
index 20732449ea9..7c075fdaeb3 100644
--- a/engines/icb/general_npc_animation.cpp
+++ b/engines/icb/general_npc_animation.cpp
@@ -651,7 +651,7 @@ void _game_session::Soft_start_single_anim(__mega_set_names next_anim) {
// next anim not in CAPS
if ((!L->voxel_info->IsAnimTable(next_anim))) {
// can't go on without a major anim - this is not a link so can't just be skipped
- Shut_down_object("by Soft_start_single_anim next anim dont exist");
+ Shut_down_object("by Soft_start_single_anim next anim don't exist");
return;
}
@@ -672,7 +672,7 @@ void _game_session::Hard_start_single_anim(__mega_set_names next_anim) {
// next anim not in CAPS
if ((!L->voxel_info->IsAnimTable(next_anim))) {
// can't go on without a major anim - this is not a link so can't just be skipped
- Shut_down_object("by Hard_start_single_anim next anim dont exist");
+ Shut_down_object("by Hard_start_single_anim next anim don't exist");
return;
}
@@ -876,7 +876,7 @@ void _game_session::Change_pose_in_current_anim_set() {
uint32 _game_session::Fetch_last_frame(__mega_set_names anima) {
// return final frame number in animation
if ((!I->IsAnimTable(anima))) {
- Fatal_error("Fetch_last_frame cant access illegal anim [%s]", master_anim_name_table[anima].name);
+ Fatal_error("Fetch_last_frame can't access illegal anim [%s]", master_anim_name_table[anima].name);
}
PXanim *pAnim = (PXanim *)rs_anims->Res_open(I->get_info_name(anima), I->info_name_hash[anima], I->base_path, I->base_path_hash);
diff --git a/engines/icb/logic.cpp b/engines/icb/logic.cpp
index 3db58a201d6..3e00f9c4dbe 100644
--- a/engines/icb/logic.cpp
+++ b/engines/icb/logic.cpp
@@ -503,7 +503,7 @@ mcodeFunctionReturnCodes _game_session::fn_kill_object(int32 &, int32 *params) {
Fatal_error("fn_kill_object finds [%s] does not exist", object_name);
if (id == cur_id)
- Fatal_error("fn_kill_object - dont use this function to shut self down [%s]", object_name);
+ Fatal_error("fn_kill_object - don't use this function to shut self down [%s]", object_name);
// Tell the event manager to stop handling events for this object.
g_oEventManager->ShutDownEventProcessingForObject(id);
@@ -673,7 +673,7 @@ mcodeFunctionReturnCodes _game_session::fn_object_rerun_logic_context(int32 &, i
uint32 id = LinkedDataObject::Fetch_item_number_by_name(objects, object_name);
if (id == 0xffffffff)
- Fatal_error("fn_object_rerun_logic_context cant find object [%s]", object_name);
+ Fatal_error("fn_object_rerun_logic_context can't find object [%s]", object_name);
logic_structs[id]->context_request = TRUE8;
@@ -738,7 +738,7 @@ mcodeFunctionReturnCodes _game_session::fn_new_script(int32 &, int32 *params) {
}
}
- Fatal_error("fn_new_script - cant find script [%s] in object [%s]", script_name, CGameObject::GetName(object));
+ Fatal_error("fn_new_script - can't find script [%s] in object [%s]", script_name, CGameObject::GetName(object));
return IR_CONT; // keep daft compiler happy
}
@@ -782,7 +782,7 @@ mcodeFunctionReturnCodes _game_session::fn_gosub(int32 &, int32 *params) {
}
}
- Fatal_error("fn_gosub - cant find script [%s] in object [%s]", script_name, CGameObject::GetName(object));
+ Fatal_error("fn_gosub - can't find script [%s] in object [%s]", script_name, CGameObject::GetName(object));
return IR_CONT; // keep daft compiler happy
}
diff --git a/engines/icb/mega_interaction.cpp b/engines/icb/mega_interaction.cpp
index 237de289d08..888af79cc84 100644
--- a/engines/icb/mega_interaction.cpp
+++ b/engines/icb/mega_interaction.cpp
@@ -127,7 +127,7 @@ mcodeFunctionReturnCodes _game_session::fn_mega_interacts(int32 &, int32 *params
// get target object
target_object = (CGame *)LinkedDataObject::Try_fetch_item_by_name(MS->objects, object_name);
if (!target_object)
- Fatal_error("fn_mega_interacts - named object [%s] dont exist", object_name);
+ Fatal_error("fn_mega_interacts - named object [%s] don't exist", object_name);
// set socket_id ready for any special socket functions
M->target_id = LinkedDataObject::Fetch_item_number_by_name(objects, object_name);
@@ -178,7 +178,7 @@ mcodeFunctionReturnCodes _game_session::fn_mega_generic_interact(int32 &, int32
// get target object
target_object = (CGame *)LinkedDataObject::Try_fetch_item_by_name(MS->objects, object_name);
if (!target_object)
- Fatal_error("fn_mega_generic_interact - named object [%s] dont exist", object_name);
+ Fatal_error("fn_mega_generic_interact - named object [%s] don't exist", object_name);
// set socket_id ready for any special socket functions
M->target_id = LinkedDataObject::Fetch_item_number_by_name(objects, object_name);
@@ -227,7 +227,7 @@ bool8 _game_session::chi_interacts(int32 id, const char *script_name) {
// get target object
target_object = (CGame *)LinkedDataObject::Fetch_item_by_number(MS->objects, id);
if (!target_object)
- Fatal_error("chi_interacts - object [%d] dont exist", id);
+ Fatal_error("chi_interacts - object [%d] don't exist", id);
// set socket_id ready for any special socket functions
M->target_id = id;
diff --git a/engines/icb/player.cpp b/engines/icb/player.cpp
index f1440cb3061..347e9735381 100644
--- a/engines/icb/player.cpp
+++ b/engines/icb/player.cpp
@@ -376,7 +376,7 @@ mcodeFunctionReturnCodes _game_session::fn_prime_player_history(int32 &, int32 *
pre_interact_floor = history[cur_history].id;
if (history[cur_history].id == PXNULL)
- Message_box("fn_prime_player_history hasnt got a legal coordinate from player?");
+ Message_box("fn_prime_player_history hasn't got a legal coordinate from player?");
Tdebug("history.txt", ">> %d", history[cur_history].id);
@@ -3158,7 +3158,7 @@ void _game_session::Restart_player() {
var_num = CGameObject::GetVariable(ob, "hits");
if (var_num == -1)
- Fatal_error("Restart_player cant fetch hits");
+ Fatal_error("Restart_player can't fetch hits");
CGameObject::SetIntegerVariable(ob, var_num, MAX_HITS); // another 10 hits
L->logic_level = 0; // restart
diff --git a/engines/icb/player_interaction.cpp b/engines/icb/player_interaction.cpp
index b3c03cc6b1a..3cd0c83ea31 100644
--- a/engines/icb/player_interaction.cpp
+++ b/engines/icb/player_interaction.cpp
@@ -417,7 +417,7 @@ bool8 _game_session::Engine_start_interaction(const char *script, uint32 id) {
// get target object
iobject = (CGame *)LinkedDataObject::Fetch_item_by_number(MS->objects, id);
if (!iobject)
- Fatal_error("Engine_start_interaction - named object dont exist"); // should never happen
+ Fatal_error("Engine_start_interaction - named object don't exist"); // should never happen
// now try and find a script with the passed extension i.e. ???::looping
for (uint32 k = 0; k < CGameObject::GetNoScripts(iobject); k++) {
diff --git a/engines/icb/route_manager.cpp b/engines/icb/route_manager.cpp
index e966fd45d4a..7f4159351a8 100644
--- a/engines/icb/route_manager.cpp
+++ b/engines/icb/route_manager.cpp
@@ -509,7 +509,7 @@ mcodeFunctionReturnCodes _game_session::fn_route_to_nico(int32 &result, int32 *p
monica = (_feature_info *)LinkedDataObject::Try_fetch_item_by_name(features, nico_name);
if (!monica)
- Fatal_error("fn_route_to_nico - object [%s] cant find nico [%s]", CGameObject::GetName(object), nico_name);
+ Fatal_error("fn_route_to_nico - object [%s] can't find nico [%s]", CGameObject::GetName(object), nico_name);
// build route
if (!Setup_route(result, (int32)monica->x, (int32)monica->z, params[1], __FULL, TRUE8)) {
@@ -897,7 +897,7 @@ mcodeFunctionReturnCodes _game_session::fn_route_to_marker(int32 &result, int32
marker = (_map_marker *)markers.Fetch_marker_by_object_name(marker_name);
if (!marker)
- Fatal_error("fn_route_to_marker - object [%s] cant find marker [%s]", CGameObject::GetName(object), marker_name);
+ Fatal_error("fn_route_to_marker - object [%s] can't find marker [%s]", CGameObject::GetName(object), marker_name);
// build route
if (!Setup_route(result, (int32)FROM_LE_FLOAT32(marker->x), (int32)FROM_LE_FLOAT32(marker->z), params[1], __FULL, TRUE8)) {
diff --git a/engines/icb/session.cpp b/engines/icb/session.cpp
index beda1821536..ce744830ba0 100644
--- a/engines/icb/session.cpp
+++ b/engines/icb/session.cpp
@@ -493,7 +493,7 @@ void _game_session::Init_objects() {
itemName = "scenes";
id = LinkedDataObject::Fetch_item_number_by_name(objects, itemName.c_str()); // returns -1 if object not in existence
if (id == 0xffffffff)
- Fatal_error("Init_objects cant find '%s'", itemName.c_str());
+ Fatal_error("Init_objects can't find '%s'", itemName.c_str());
Common::String hashString = itemName + "::globals";
script_hash = HashString(hashString.c_str());
const char *pc = (const char *)LinkedDataObject::Try_fetch_item_by_hash(scripts, script_hash);
diff --git a/engines/icb/speech.cpp b/engines/icb/speech.cpp
index 4cfd5a1e833..eb8899b4d8c 100644
--- a/engines/icb/speech.cpp
+++ b/engines/icb/speech.cpp
@@ -90,7 +90,7 @@ mcodeFunctionReturnCodes _game_session::fn_get_speech_status(int32 &result, int3
if (g_icb->getGameType() == GType_ICB) {
if ((cur_id == player.Fetch_player_id()) && (player.player_status == REMORA))
- Fatal_error("fn_get_speech_status - player cant start conversation inside remora!");
+ Fatal_error("fn_get_speech_status - player can't start conversation inside remora!");
if ((cur_id == player.Fetch_player_id()) && (g_oIconMenu->IsActive()))
g_oIconMenu->CloseDownIconMenu();
@@ -168,7 +168,7 @@ mcodeFunctionReturnCodes _game_session::fn_request_speech(int32 &result, int32 *
// conversation script doesn't exist
if (!S.script_pc)
- Fatal_error("object [%d] tried to start conversation script [%s] which doesnt exist", cur_id, (const char *)temp_buf);
+ Fatal_error("object [%d] tried to start conversation script [%s] which doesn't exist", cur_id, (const char *)temp_buf);
// reset number of subs
S.total_subscribers = 0; // everyone but us initially
@@ -214,7 +214,7 @@ mcodeFunctionReturnCodes _game_session::fn_add_talker(int32 &, int32 *params) {
Fatal_error("fn_add_talker finds [%s] is not a real object", object_name);
if (cur_id == talk_id)
- Fatal_error("[%s] calls fn_add_talker('%s') which isnt necessary and may cause strange lock up effects!", object_name, object_name);
+ Fatal_error("[%s] calls fn_add_talker('%s') which isn't necessary and may cause strange lock up effects!", object_name, object_name);
Zdebug("talk id %d", talk_id);
@@ -888,7 +888,7 @@ mcodeFunctionReturnCodes _game_session::speak_set_custom(int32 &, int32 *params)
speaker_id = LinkedDataObject::Fetch_item_number_by_name(objects, person_name);
if (speaker_id == -1)
- Fatal_error("speak_set_custom cant find object [%s]", person_name);
+ Fatal_error("speak_set_custom can't find object [%s]", person_name);
Set_string(custom_name, logic_structs[speaker_id]->mega->custom_set, MAX_CUSTOM_NAME_LENGTH);
logic_structs[speaker_id]->mega->custom = TRUE8;
diff --git a/engines/icb/stagedraw_pc_poly.cpp b/engines/icb/stagedraw_pc_poly.cpp
index bc90567954a..593bdb985ce 100644
--- a/engines/icb/stagedraw_pc_poly.cpp
+++ b/engines/icb/stagedraw_pc_poly.cpp
@@ -274,7 +274,7 @@ TextureHandle *GetRegisteredTexture(const char *tex_name, uint32 tex_hash, const
void PreRegisterTexture(const char *tex_name, uint32 tex_hash, const char *pal_name, uint32 pal_hash, const char *base, uint32 base_hash) {
TextureHandle *th = GetRegisteredTexture(tex_name, tex_hash, pal_name, pal_hash, base, base_hash);
if (!th)
- Fatal_error("Cant open texture:palette %s:%s\n", tex_name, pal_name);
+ Fatal_error("Can't open texture:palette %s:%s\n", tex_name, pal_name);
}
void drawObjects(SDactor &act, PSXLampList &lamplist, PSXrgb *pAmbient, PSXShadeList &shadelist, MATRIXPC *local2screen, int32 *brightnessReturn) {
More information about the Scummvm-git-logs
mailing list