[Scummvm-git-logs] scummvm master -> 8700d7ead74766648a39f0536d2e9e606421dda7
bluegr
noreply at scummvm.org
Sat Feb 7 14:48:42 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
a4cce5aef6 ULTIMA: Replace Std::string with Common::String
922976fa67 ULTIMA: Replace Std::list with Common::List
8700d7ead7 ULTIMA: Replace Std::vector with Common::Array
Commit: a4cce5aef64e4bc2a21e8974e15eabdaf374c052
https://github.com/scummvm/scummvm/commit/a4cce5aef64e4bc2a21e8974e15eabdaf374c052
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-02-07T16:48:36+02:00
Commit Message:
ULTIMA: Replace Std::string with Common::String
Changed paths:
R engines/ultima/shared/std/string.h
engines/ultima/nuvie/actors/actor.h
engines/ultima/nuvie/actors/actor_manager.cpp
engines/ultima/nuvie/actors/actor_manager.h
engines/ultima/nuvie/conf/config_node.h
engines/ultima/nuvie/conf/configuration.cpp
engines/ultima/nuvie/conf/configuration.h
engines/ultima/nuvie/conf/misc.cpp
engines/ultima/nuvie/conf/misc.h
engines/ultima/nuvie/core/anim_manager.cpp
engines/ultima/nuvie/core/anim_manager.h
engines/ultima/nuvie/core/book.cpp
engines/ultima/nuvie/core/converse.cpp
engines/ultima/nuvie/core/converse.h
engines/ultima/nuvie/core/converse_interpret.cpp
engines/ultima/nuvie/core/converse_interpret.h
engines/ultima/nuvie/core/cursor.cpp
engines/ultima/nuvie/core/cursor.h
engines/ultima/nuvie/core/effect.cpp
engines/ultima/nuvie/core/effect.h
engines/ultima/nuvie/core/egg_manager.h
engines/ultima/nuvie/core/events.cpp
engines/ultima/nuvie/core/events.h
engines/ultima/nuvie/core/game.cpp
engines/ultima/nuvie/core/game.h
engines/ultima/nuvie/core/magic.cpp
engines/ultima/nuvie/core/map.cpp
engines/ultima/nuvie/core/map.h
engines/ultima/nuvie/core/obj_manager.cpp
engines/ultima/nuvie/core/party.cpp
engines/ultima/nuvie/core/party.h
engines/ultima/nuvie/core/player.cpp
engines/ultima/nuvie/core/tile_manager.h
engines/ultima/nuvie/core/timed_event.cpp
engines/ultima/nuvie/core/timed_event.h
engines/ultima/nuvie/core/weather.cpp
engines/ultima/nuvie/core/weather.h
engines/ultima/nuvie/files/nuvie_bmp_file.cpp
engines/ultima/nuvie/files/nuvie_bmp_file.h
engines/ultima/nuvie/files/nuvie_file_list.cpp
engines/ultima/nuvie/files/nuvie_file_list.h
engines/ultima/nuvie/files/nuvie_io_file.h
engines/ultima/nuvie/files/tmx_map.cpp
engines/ultima/nuvie/files/tmx_map.h
engines/ultima/nuvie/files/u6_bmp.cpp
engines/ultima/nuvie/files/u6_bmp.h
engines/ultima/nuvie/files/u6_lib_n.cpp
engines/ultima/nuvie/files/u6_lib_n.h
engines/ultima/nuvie/files/u6_lzw.cpp
engines/ultima/nuvie/files/u6_lzw.h
engines/ultima/nuvie/files/u6_shape.h
engines/ultima/nuvie/files/utils.cpp
engines/ultima/nuvie/fonts/bmp_font.cpp
engines/ultima/nuvie/fonts/conv_font.cpp
engines/ultima/nuvie/fonts/font.h
engines/ultima/nuvie/fonts/font_manager.cpp
engines/ultima/nuvie/fonts/font_manager.h
engines/ultima/nuvie/gui/gui.cpp
engines/ultima/nuvie/gui/gui_console.cpp
engines/ultima/nuvie/gui/gui_console.h
engines/ultima/nuvie/gui/gui_dialog.cpp
engines/ultima/nuvie/gui/gui_scroll_bar.cpp
engines/ultima/nuvie/gui/gui_scroller.cpp
engines/ultima/nuvie/gui/widgets/background.cpp
engines/ultima/nuvie/gui/widgets/command_bar.cpp
engines/ultima/nuvie/gui/widgets/command_bar.h
engines/ultima/nuvie/gui/widgets/command_bar_new_ui.cpp
engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
engines/ultima/nuvie/gui/widgets/console.cpp
engines/ultima/nuvie/gui/widgets/console.h
engines/ultima/nuvie/gui/widgets/converse_gump.cpp
engines/ultima/nuvie/gui/widgets/converse_gump.h
engines/ultima/nuvie/gui/widgets/converse_gump_wou.cpp
engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
engines/ultima/nuvie/gui/widgets/fps_counter.cpp
engines/ultima/nuvie/gui/widgets/map_window.cpp
engines/ultima/nuvie/gui/widgets/map_window.h
engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
engines/ultima/nuvie/gui/widgets/msg_scroll.h
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
engines/ultima/nuvie/keybinding/keys.cpp
engines/ultima/nuvie/keybinding/keys.h
engines/ultima/nuvie/menus/cheats_dialog.cpp
engines/ultima/nuvie/menus/gameplay_dialog.cpp
engines/ultima/nuvie/menus/input_dialog.cpp
engines/ultima/nuvie/menus/video_dialog.cpp
engines/ultima/nuvie/misc/call_back.h
engines/ultima/nuvie/misc/u6_misc.cpp
engines/ultima/nuvie/misc/u6_misc.h
engines/ultima/nuvie/nuvie.cpp
engines/ultima/nuvie/nuvie.h
engines/ultima/nuvie/save/save_game.cpp
engines/ultima/nuvie/save/save_game.h
engines/ultima/nuvie/screen/dither.cpp
engines/ultima/nuvie/screen/game_palette.cpp
engines/ultima/nuvie/screen/screen.cpp
engines/ultima/nuvie/screen/screen.h
engines/ultima/nuvie/script/script.cpp
engines/ultima/nuvie/script/script.h
engines/ultima/nuvie/script/script_cutscene.cpp
engines/ultima/nuvie/script/script_cutscene.h
engines/ultima/nuvie/sound/adlib_sfx_manager.cpp
engines/ultima/nuvie/sound/adplug/adplug_player.h
engines/ultima/nuvie/sound/adplug/mid.cpp
engines/ultima/nuvie/sound/adplug/mid.h
engines/ultima/nuvie/sound/adplug/u6m.h
engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
engines/ultima/nuvie/sound/pc_speaker_sfx_manager.cpp
engines/ultima/nuvie/sound/sound.h
engines/ultima/nuvie/sound/sound_manager.cpp
engines/ultima/nuvie/sound/sound_manager.h
engines/ultima/nuvie/sound/towns_sfx_manager.cpp
engines/ultima/nuvie/usecode/u6_usecode.cpp
engines/ultima/nuvie/usecode/u6_usecode.h
engines/ultima/nuvie/usecode/usecode.cpp
engines/ultima/nuvie/usecode/usecode.h
engines/ultima/nuvie/views/container_view_gump.cpp
engines/ultima/nuvie/views/container_view_gump.h
engines/ultima/nuvie/views/portrait_view.cpp
engines/ultima/nuvie/views/portrait_view.h
engines/ultima/nuvie/views/scroll_view_gump.cpp
engines/ultima/nuvie/views/scroll_view_gump.h
engines/ultima/nuvie/views/scroll_widget_gump.cpp
engines/ultima/nuvie/views/scroll_widget_gump.h
engines/ultima/nuvie/views/spell_view_gump.cpp
engines/ultima/nuvie/views/spell_view_gump.h
engines/ultima/nuvie/views/view.cpp
engines/ultima/nuvie/views/view.h
engines/ultima/nuvie/views/view_manager.cpp
engines/ultima/ultima4/game/armor.h
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/audio/audio_process.h
engines/ultima/ultima8/audio/cru_music_process.cpp
engines/ultima/ultima8/audio/music_flex.cpp
engines/ultima/ultima8/audio/sound_flex.cpp
engines/ultima/ultima8/audio/sound_flex.h
engines/ultima/ultima8/audio/speech_flex.cpp
engines/ultima/ultima8/audio/speech_flex.h
engines/ultima/ultima8/conf/config_file_manager.cpp
engines/ultima/ultima8/conf/config_file_manager.h
engines/ultima/ultima8/filesys/savegame.cpp
engines/ultima/ultima8/filesys/savegame.h
engines/ultima/ultima8/filesys/u8_save_file.h
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/games/game_data.h
engines/ultima/ultima8/games/game_info.cpp
engines/ultima/ultima8/games/game_info.h
engines/ultima/ultima8/games/treasure_loader.cpp
engines/ultima/ultima8/games/treasure_loader.h
engines/ultima/ultima8/games/u8_game.cpp
engines/ultima/ultima8/games/u8_game.h
engines/ultima/ultima8/gfx/fonts/font.cpp
engines/ultima/ultima8/gfx/fonts/font.h
engines/ultima/ultima8/gfx/fonts/font_manager.h
engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
engines/ultima/ultima8/gfx/fonts/jp_font.cpp
engines/ultima/ultima8/gfx/fonts/jp_font.h
engines/ultima/ultima8/gfx/fonts/shape_font.cpp
engines/ultima/ultima8/gfx/fonts/shape_font.h
engines/ultima/ultima8/gfx/fonts/tt_font.cpp
engines/ultima/ultima8/gfx/fonts/tt_font.h
engines/ultima/ultima8/gfx/skf_player.cpp
engines/ultima/ultima8/gfx/type_flags.cpp
engines/ultima/ultima8/gumps/ask_gump.cpp
engines/ultima/ultima8/gumps/bark_gump.cpp
engines/ultima/ultima8/gumps/bark_gump.h
engines/ultima/ultima8/gumps/book_gump.cpp
engines/ultima/ultima8/gumps/book_gump.h
engines/ultima/ultima8/gumps/computer_gump.cpp
engines/ultima/ultima8/gumps/computer_gump.h
engines/ultima/ultima8/gumps/credits_gump.cpp
engines/ultima/ultima8/gumps/credits_gump.h
engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
engines/ultima/ultima8/gumps/cru_pickup_gump.h
engines/ultima/ultima8/gumps/menu_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.h
engines/ultima/ultima8/gumps/movie_gump.cpp
engines/ultima/ultima8/gumps/movie_gump.h
engines/ultima/ultima8/gumps/paperdoll_gump.cpp
engines/ultima/ultima8/gumps/paperdoll_gump.h
engines/ultima/ultima8/gumps/quit_gump.cpp
engines/ultima/ultima8/gumps/readable_gump.cpp
engines/ultima/ultima8/gumps/readable_gump.h
engines/ultima/ultima8/gumps/scroll_gump.cpp
engines/ultima/ultima8/gumps/scroll_gump.h
engines/ultima/ultima8/gumps/u8_save_gump.cpp
engines/ultima/ultima8/gumps/u8_save_gump.h
engines/ultima/ultima8/gumps/weasel_gump.cpp
engines/ultima/ultima8/gumps/weasel_gump.h
engines/ultima/ultima8/gumps/widgets/button_widget.cpp
engines/ultima/ultima8/gumps/widgets/button_widget.h
engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
engines/ultima/ultima8/gumps/widgets/edit_widget.h
engines/ultima/ultima8/gumps/widgets/text_widget.cpp
engines/ultima/ultima8/gumps/widgets/text_widget.h
engines/ultima/ultima8/kernel/kernel.cpp
engines/ultima/ultima8/kernel/kernel.h
engines/ultima/ultima8/kernel/object_manager.cpp
engines/ultima/ultima8/kernel/object_manager.h
engines/ultima/ultima8/misc/util.cpp
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/usecode/intrinsics.h
engines/ultima/ultima8/usecode/uc_list.cpp
engines/ultima/ultima8/usecode/uc_list.h
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/usecode/uc_machine.h
engines/ultima/ultima8/world/actors/combat_dat.h
engines/ultima/ultima8/world/actors/main_actor.h
engines/ultima/ultima8/world/actors/npc_dat.h
engines/ultima/ultima8/world/actors/treasure_info.h
engines/ultima/ultima8/world/damage_info.h
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item.h
engines/ultima/ultima8/world/target_reticle_process.cpp
engines/ultima/ultima8/world/weapon_info.h
diff --git a/engines/ultima/nuvie/actors/actor.h b/engines/ultima/nuvie/actors/actor.h
index 1583b725ba9..4599cdbd275 100644
--- a/engines/ultima/nuvie/actors/actor.h
+++ b/engines/ultima/nuvie/actors/actor.h
@@ -23,7 +23,7 @@
#define NUVIE_ACTORS_ACTOR_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/misc/actor_list.h"
#include "ultima/nuvie/core/map.h"
#include "ultima/nuvie/core/obj_manager.h"
@@ -32,7 +32,6 @@ namespace Ultima {
namespace Nuvie {
using Std::list;
-using Std::string;
using Std::vector;
#define ACTOR_NO_READIABLE_LOCATION -1
@@ -285,7 +284,7 @@ protected:
uint8 body_armor_class;
uint8 readied_armor_class;
- string name;
+ Common::String name;
ReadiedObj *readied_objects[ACTOR_MAX_READIED_OBJECTS];
diff --git a/engines/ultima/nuvie/actors/actor_manager.cpp b/engines/ultima/nuvie/actors/actor_manager.cpp
index ae2cdecb5bb..f6e59143771 100644
--- a/engines/ultima/nuvie/actors/actor_manager.cpp
+++ b/engines/ultima/nuvie/actors/actor_manager.cpp
@@ -1106,13 +1106,13 @@ void ActorManager::loadAvatarTiles(const Common::Path &datadir) {
uint8 avatar_portrait = Game::get_game()->get_portrait()->get_avatar_portrait_num();
- Std::vector<Std::string> files = getCustomTileFilenames(datadir, "avatar_###_####.bmp");
+ Std::vector<Common::String> files = getCustomTileFilenames(datadir, "avatar_###_####.bmp");
- for (const Std::string &filename : files) {
+ for (const Common::String &filename : files) {
if (filename.size() != 19) { // avatar_nnn_nnnn.bmp
continue;
}
- Std::string num_str = filename.substr(7, 3);
+ Common::String num_str = filename.substr(7, 3);
uint8 portrait_num = (uint8)strtol(num_str.c_str(), nullptr, 10);
if (portrait_num == avatar_portrait) {
@@ -1134,13 +1134,13 @@ void ActorManager::loadAvatarTiles(const Common::Path &datadir) {
void ActorManager::loadNPCTiles(const Common::Path &datadir) {
Common::Path imagefile;
- Std::vector<Std::string> files = getCustomTileFilenames(datadir, "actor_###_####.bmp");
+ Std::vector<Common::String> files = getCustomTileFilenames(datadir, "actor_###_####.bmp");
- for (const Std::string &filename : files) {
+ for (const Common::String &filename : files) {
if (filename.size() != 18) { // actor_nnn_nnnn.bmp
continue;
}
- Std::string num_str = filename.substr(6, 3);
+ Common::String num_str = filename.substr(6, 3);
uint8 actor_num = (uint8)strtol(num_str.c_str(), nullptr, 10);
num_str = filename.substr(10, 4);
@@ -1157,7 +1157,7 @@ void ActorManager::loadNPCTiles(const Common::Path &datadir) {
return;
}
-Std::vector<Std::string> ActorManager::getCustomTileFilenames(const Common::Path &datadir, const Std::string &filenamePrefix) {
+Std::vector<Common::String> ActorManager::getCustomTileFilenames(const Common::Path &datadir, const Common::String &filenamePrefix) {
NuvieFileList filelistDataDir;
NuvieFileList filelistSaveGameDir;
Common::Path path;
@@ -1172,8 +1172,8 @@ Std::vector<Std::string> ActorManager::getCustomTileFilenames(const Common::Path
const Std::list<NuvieFileDesc> &files = filelistSaveGameDir.get_filelist();
const Std::list<NuvieFileDesc> &dataFiles = filelistDataDir.get_filelist();
- Common::EqualTo<Std::string> comparitor;
- Std::vector<Std::string> filenames;
+ Common::EqualTo<Common::String> comparitor;
+ Std::vector<Common::String> filenames;
for (const auto &desc : files) {
filenames.push_back(desc.filename);
}
diff --git a/engines/ultima/nuvie/actors/actor_manager.h b/engines/ultima/nuvie/actors/actor_manager.h
index da96e476234..aa11e9b1518 100644
--- a/engines/ultima/nuvie/actors/actor_manager.h
+++ b/engines/ultima/nuvie/actors/actor_manager.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_ACTORS_ACTOR_MANAGER_H
#define NUVIE_ACTORS_ACTOR_MANAGER_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/obj_manager.h"
#include "ultima/nuvie/misc/actor_list.h"
#include "ultima/nuvie/actors/actor.h"
@@ -164,7 +164,7 @@ private:
void loadNPCTiles(const Common::Path &datadir);
void loadAvatarTiles(const Common::Path &datadir);
void loadCustomBaseTiles();
- Std::vector<Std::string> getCustomTileFilenames(const Common::Path &datadir, const Std::string &filenamePrefix);
+ Std::vector<Common::String> getCustomTileFilenames(const Common::Path &datadir, const Common::String &filenamePrefix);
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/conf/config_node.h b/engines/ultima/nuvie/conf/config_node.h
index 1e11de3796e..2ed536515bf 100644
--- a/engines/ultima/nuvie/conf/config_node.h
+++ b/engines/ultima/nuvie/conf/config_node.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CONF_CONFIG_NODE_H
#define NUVIE_CONF_CONFIG_NODE_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/conf/configuration.h"
namespace Ultima {
@@ -30,7 +30,7 @@ namespace Nuvie {
class ConfigNode {
friend class Configuration;
- ConfigNode(Configuration &config_, Std::string key_)
+ ConfigNode(Configuration &config_, Common::String key_)
: config(config_), key(key_) {
}
@@ -44,8 +44,8 @@ public:
return *this;
}
- Std::string get_string(const char *defaultvalue = "") {
- Std::string s;
+ Common::String get_string(const char *defaultvalue = "") {
+ Common::String s;
config.value(key, s, defaultvalue);
return s;
}
@@ -60,7 +60,7 @@ public:
return b;
}
- void set(const Std::string &value) {
+ void set(const Common::String &value) {
config.set(key, value);
}
void set(const char *value) {
@@ -75,7 +75,7 @@ public:
private:
Configuration &config;
- Std::string key;
+ Common::String key;
};
diff --git a/engines/ultima/nuvie/conf/configuration.cpp b/engines/ultima/nuvie/conf/configuration.cpp
index f9c830ed509..f6c2f4c8be3 100644
--- a/engines/ultima/nuvie/conf/configuration.cpp
+++ b/engines/ultima/nuvie/conf/configuration.cpp
@@ -49,7 +49,7 @@ Configuration::~Configuration() {
ConfMan.flushToDisk();
}
-bool Configuration::readConfigFile(const Std::string &fname, const Std::string &root,
+bool Configuration::readConfigFile(const Common::String &fname, const Common::String &root,
bool readonly) {
_configFilename = fname;
Shared::XMLTree *tree = new Shared::XMLTree();
@@ -77,7 +77,7 @@ void Configuration::clear() {
_trees.clear();
}
-void Configuration::value(const Std::string &key, Std::string &ret,
+void Configuration::value(const Common::String &key, Common::String &ret,
const char *defaultvalue) const {
// Check for a .cfg file value in the trees
for (int i = _trees.size() - 1; i >= 0; --i) {
@@ -89,7 +89,7 @@ void Configuration::value(const Std::string &key, Std::string &ret,
}
assert(key.hasPrefix("config/"));
- Std::string k = key.substr(7);
+ Common::String k = key.substr(7);
// Check for local entry
if (_localKeys.contains(k)) {
@@ -106,7 +106,7 @@ void Configuration::value(const Std::string &key, Std::string &ret,
ret = defaultvalue;
}
-void Configuration::value(const Std::string &key, int &ret, int defaultvalue) const {
+void Configuration::value(const Common::String &key, int &ret, int defaultvalue) const {
// Check for a .cfg file value in the trees
for (int i = _trees.size() - 1; i >= 0; --i) {
const Shared::XMLTree *tree = _trees[i];
@@ -117,7 +117,7 @@ void Configuration::value(const Std::string &key, int &ret, int defaultvalue) co
}
assert(key.hasPrefix("config/"));
- Std::string k = key.substr(7);
+ Common::String k = key.substr(7);
// Check for local entry
if (_localKeys.contains(k)) {
@@ -134,7 +134,7 @@ void Configuration::value(const Std::string &key, int &ret, int defaultvalue) co
ret = defaultvalue;
}
-void Configuration::value(const Std::string &key, bool &ret, bool defaultvalue) const {
+void Configuration::value(const Common::String &key, bool &ret, bool defaultvalue) const {
// Check for a .cfg file value in the trees
for (int i = _trees.size() - 1; i >= 0; --i) {
const Shared::XMLTree *tree = _trees[i];
@@ -145,7 +145,7 @@ void Configuration::value(const Std::string &key, bool &ret, bool defaultvalue)
}
assert(key.hasPrefix("config/"));
- Std::string k = key.substr(7);
+ Common::String k = key.substr(7);
// Check for local entry
if (_localKeys.contains(k)) {
@@ -164,14 +164,14 @@ void Configuration::value(const Std::string &key, bool &ret, bool defaultvalue)
ret = defaultvalue;
}
-void Configuration::pathFromValue(const Std::string &key, const Std::string &file, Common::Path &full_path) const {
- Std::string tmp;
+void Configuration::pathFromValue(const Common::String &key, const Common::String &file, Common::Path &full_path) const {
+ Common::String tmp;
value(key, tmp);
full_path = Common::Path(tmp).joinInPlace(file);
}
-bool Configuration::set(const Std::string &key, const Std::string &value) {
+bool Configuration::set(const Common::String &key, const Common::String &value) {
// Currently a value is written to the last writable tree with
// the correct root.
@@ -185,7 +185,7 @@ bool Configuration::set(const Std::string &key, const Std::string &value) {
}
assert(key.hasPrefix("config/"));
- Std::string k = key.substr(7);
+ Common::String k = key.substr(7);
if (_localKeys.contains(k)) {
_localKeys[k] = value;
@@ -199,12 +199,12 @@ bool Configuration::set(const Std::string &key, const Std::string &value) {
return true;
}
-bool Configuration::set(const Std::string &key, const char *value) {
- return set(key, Std::string(value));
+bool Configuration::set(const Common::String &key, const char *value) {
+ return set(key, Common::String(value));
}
-bool Configuration::set(const Std::string &key, int value) {
+bool Configuration::set(const Common::String &key, int value) {
// Currently a value is written to the last writable tree with
// the correct root.
@@ -218,7 +218,7 @@ bool Configuration::set(const Std::string &key, int value) {
}
assert(key.hasPrefix("config/"));
- Std::string k = key.substr(7);
+ Common::String k = key.substr(7);
if (_localKeys.contains(k)) {
_localKeys[k] = Common::String::format("%d", value);
@@ -232,7 +232,7 @@ bool Configuration::set(const Std::string &key, int value) {
return true;
}
-bool Configuration::set(const Std::string &key, bool value) {
+bool Configuration::set(const Common::String &key, bool value) {
// Currently a value is written to the last writable tree with
// the correct root.
@@ -246,7 +246,7 @@ bool Configuration::set(const Std::string &key, bool value) {
}
assert(key.hasPrefix("config/"));
- Std::string k = key.substr(7);
+ Common::String k = key.substr(7);
Common::String strValue = value ? "yes" : "no";
if (_localKeys.contains(k)) {
@@ -260,11 +260,11 @@ bool Configuration::set(const Std::string &key, bool value) {
return true;
}
-ConfigNode *Configuration::getNode(const Std::string &key) {
+ConfigNode *Configuration::getNode(const Common::String &key) {
return new ConfigNode(*this, key);
}
-void Configuration::getSubkeys(KeyTypeList &ktl, const Std::string &basekey) {
+void Configuration::getSubkeys(KeyTypeList &ktl, const Common::String &basekey) {
for (Shared::XMLTree *tree : _trees) {
Shared::XMLTree::KeyTypeList l;
tree->getSubkeys(l, basekey);
diff --git a/engines/ultima/nuvie/conf/configuration.h b/engines/ultima/nuvie/conf/configuration.h
index 31dc613fb78..ad31f73ff56 100644
--- a/engines/ultima/nuvie/conf/configuration.h
+++ b/engines/ultima/nuvie/conf/configuration.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CONF_CONFIGURATION_H
#define NUVIE_CONF_CONFIGURATION_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
#include "ultima/detection.h"
@@ -65,7 +65,7 @@ private:
Common::IgnoreCase_EqualTo> _localKeys;
Common::HashMap<Common::String, Common::String, Common::IgnoreCase_Hash,
Common::IgnoreCase_EqualTo> _settings;
- Std::string _configFilename;
+ Common::String _configFilename;
bool _configChanged;
// Sets default configurations common to both enhanced and unhenaced
@@ -81,7 +81,7 @@ public:
~Configuration();
// read config file. Multiple files may be read. Order is important.
- bool readConfigFile(const Std::string &fname, const Std::string &root, bool readonly = true);
+ bool readConfigFile(const Common::String &fname, const Common::String &root, bool readonly = true);
// Loads up the configuration settings
void load(GameId gameId, bool isEnhanced);
@@ -93,25 +93,25 @@ public:
void clear();
// get value
- void value(const Std::string &key, Std::string &ret, const char *defaultvalue = "") const;
- void value(const Std::string &key, int &ret, int defaultvalue = 0) const;
- void value(const Std::string &key, bool &ret, bool defaultvalue = false) const;
+ void value(const Common::String &key, Common::String &ret, const char *defaultvalue = "") const;
+ void value(const Common::String &key, int &ret, int defaultvalue = 0) const;
+ void value(const Common::String &key, bool &ret, bool defaultvalue = false) const;
- void pathFromValue(const Std::string &key, const Std::string &file, Common::Path &full_path) const;
+ void pathFromValue(const Common::String &key, const Common::String &file, Common::Path &full_path) const;
// set value
- bool set(const Std::string &key, const Std::string &value);
- bool set(const Std::string &key, const char *value);
- bool set(const Std::string &key, int value);
- bool set(const Std::string &key, bool value);
+ bool set(const Common::String &key, const Common::String &value);
+ bool set(const Common::String &key, const char *value);
+ bool set(const Common::String &key, int value);
+ bool set(const Common::String &key, bool value);
// get node ref. (delete it afterwards)
- ConfigNode *getNode(const Std::string &key);
+ ConfigNode *getNode(const Common::String &key);
typedef Common::Pair<Common::String, Common::String> KeyType;
typedef Common::Array<KeyType> KeyTypeList;
- void getSubkeys(KeyTypeList &ktl, const Std::string &basekey);
+ void getSubkeys(KeyTypeList &ktl, const Common::String &basekey);
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/conf/misc.cpp b/engines/ultima/nuvie/conf/misc.cpp
index 66f4fc5d6bb..baea1dd580b 100644
--- a/engines/ultima/nuvie/conf/misc.cpp
+++ b/engines/ultima/nuvie/conf/misc.cpp
@@ -24,8 +24,8 @@
namespace Ultima {
namespace Nuvie {
-Std::string readLine(Common::ReadStream *stream) {
- Std::string line;
+Common::String readLine(Common::ReadStream *stream) {
+ Common::String line;
char c;
while (!stream->eos() && (c = stream->readByte()) != '\n')
line += c;
diff --git a/engines/ultima/nuvie/conf/misc.h b/engines/ultima/nuvie/conf/misc.h
index 08e0e122cbb..f3a61a3e6f9 100644
--- a/engines/ultima/nuvie/conf/misc.h
+++ b/engines/ultima/nuvie/conf/misc.h
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "common/stream.h"
#ifndef NUVIE_CONF_MISC_H
@@ -28,9 +28,9 @@
namespace Ultima {
namespace Nuvie {
-extern bool string_i_compare(const Std::string &s1, const Std::string &s2);
+extern bool string_i_compare(const Common::String &s1, const Common::String &s2);
-extern Std::string readLine(Common::ReadStream *stream);
+extern Common::String readLine(Common::ReadStream *stream);
} // End of namespace Nuvie
} // End of namespace Ultima
diff --git a/engines/ultima/nuvie/core/anim_manager.cpp b/engines/ultima/nuvie/core/anim_manager.cpp
index 3ed2994b05a..139822d85b5 100644
--- a/engines/ultima/nuvie/core/anim_manager.cpp
+++ b/engines/ultima/nuvie/core/anim_manager.cpp
@@ -445,7 +445,7 @@ uint16 HitAnim::callback(uint16 msg, CallBack *caller, void *msg_data) {
/*** TextAnim ***/
-TextAnim::TextAnim(Std::string t, MapCoord loc, uint32 dur) {
+TextAnim::TextAnim(Common::String t, MapCoord loc, uint32 dur) {
_px = loc.x;
_py = loc.y;
duration = dur;
diff --git a/engines/ultima/nuvie/core/anim_manager.h b/engines/ultima/nuvie/core/anim_manager.h
index 9ba3d91de5c..1ff0a36b800 100644
--- a/engines/ultima/nuvie/core/anim_manager.h
+++ b/engines/ultima/nuvie/core/anim_manager.h
@@ -33,7 +33,6 @@ namespace Ultima {
namespace Nuvie {
using Std::list;
-using Std::string;
using Std::vector;
class Actor;
@@ -453,12 +452,12 @@ public:
};
class TextAnim : public TimedAnim {
- Std::string text;
+ Common::String text;
Font *font;
uint32 duration;
public:
- TextAnim(Std::string text, MapCoord loc, uint32 dur);
+ TextAnim(Common::String text, MapCoord loc, uint32 dur);
~TextAnim() override;
uint16 callback(uint16 msg, CallBack *caller, void *msg_data) override;
void start() override {
diff --git a/engines/ultima/nuvie/core/book.cpp b/engines/ultima/nuvie/core/book.cpp
index 91bcacd693b..2cb07976e39 100644
--- a/engines/ultima/nuvie/core/book.cpp
+++ b/engines/ultima/nuvie/core/book.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/files/u6_lib_n.h"
diff --git a/engines/ultima/nuvie/core/converse.cpp b/engines/ultima/nuvie/core/converse.cpp
index 18d0295fa60..3d68353da39 100644
--- a/engines/ultima/nuvie/core/converse.cpp
+++ b/engines/ultima/nuvie/core/converse.cpp
@@ -60,7 +60,7 @@ Converse::Converse() : config(nullptr), actors(nullptr), objects(nullptr),
void
Converse::init(const Configuration *cfg, nuvie_game_t t, MsgScroll *s, ActorManager *a,
GameClock *c, Player *p, ViewManager *v, ObjManager *o) {
- Std::string townsdir;
+ Common::String townsdir;
config = cfg;
scroll = s;
@@ -123,7 +123,7 @@ void Converse::reset() {
/* Load `convfilename' as src.
*/
-void Converse::load_conv(const Std::string &convfilename) {
+void Converse::load_conv(const Common::String &convfilename) {
Common::Path conv_lib_str;
if (gametype == NUVIE_GAME_U6 && using_fmtowns) {
config->pathFromValue("config/townsdir", convfilename, conv_lib_str);
@@ -398,7 +398,7 @@ void Converse::stop() {
*/
bool Converse::input() {
if (scroll->has_input()) {
- Std::string s = scroll->get_input();
+ Common::String s = scroll->get_input();
set_input(s);
#ifdef CONVERSE_DEBUG
DEBUG(0, LEVEL_DEBUGGING, "Converse: INPUT \"%s\"\n\n", get_input().c_str());
@@ -734,7 +734,7 @@ void ConvScript::write2(converse_value val) {
ConverseGumpType get_converse_gump_type_from_config(const Configuration *config) {
- Std::string configvalue;
+ Common::String configvalue;
config->value("config/general/converse_gump", configvalue, "default");
if (string_i_compare(configvalue, "default")) {
diff --git a/engines/ultima/nuvie/core/converse.h b/engines/ultima/nuvie/core/converse.h
index fd0b4066fb4..437ffbfe84a 100644
--- a/engines/ultima/nuvie/core/converse.h
+++ b/engines/ultima/nuvie/core/converse.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_CONVERSE_H
#define NUVIE_CORE_CONVERSE_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
#include "ultima/nuvie/actors/actor.h"
#include "ultima/nuvie/gui/widgets/msg_scroll.h"
@@ -47,8 +47,6 @@ class ConverseInterpret;
class ConverseSpeech;
class ConvScript;
-using Std::string;
-
ConverseGumpType get_converse_gump_type_from_config(const Configuration *config);
typedef uint32 converse_value; // any single value read from a script
@@ -105,14 +103,14 @@ class Converse {
Actor *npc;
uint8 npc_num;
uint8 script_num; //this could differ from npc_num when talking to guards or wisps etc.
- Std::string _name, _desc;
+ Common::String _name, _desc;
bool active; // running npc script? (either paused or unpaused)
bool need_input; // waiting for text input
bool party_all_the_time; // force NPCs to join player's party?
- string in_str; // last input from player
- string out_str; // text that is to be printed
+ Common::String in_str; // last input from player
+ Common::String out_str; // text that is to be printed
char *allowed_input; // characters requested for single-character input
char aname[16]; // return from npc_name()
@@ -133,7 +131,7 @@ public:
GameClock *c, Player *p, ViewManager *v, ObjManager *o);
uint32 get_script_num(uint8 a);
- void load_conv(const Std::string &convfilename);
+ void load_conv(const Common::String &convfilename);
uint32 load_conv(uint8 a);
void unload_conv() {
delete src;
@@ -162,16 +160,16 @@ public:
bool input();
void print(const char *s = nullptr);
- const Std::string &get_input() const {
+ const Common::String &get_input() const {
return in_str;
}
- const Std::string &get_output() const {
+ const Common::String &get_output() const {
return out_str;
}
- void set_input(Std::string s) {
+ void set_input(Common::String s) {
in_str = s;
}
- void set_output(Std::string s) {
+ void set_output(Common::String s) {
out_str = s;
}
diff --git a/engines/ultima/nuvie/core/converse_interpret.cpp b/engines/ultima/nuvie/core/converse_interpret.cpp
index ee89594cb4d..3c7f8a1d4a9 100644
--- a/engines/ultima/nuvie/core/converse_interpret.cpp
+++ b/engines/ultima/nuvie/core/converse_interpret.cpp
@@ -248,17 +248,17 @@ void ConverseInterpret::exec() {
/* Print script text, resolving special symbols as they are encountered.
*/
void ConverseInterpret::do_text() {
- string output = get_formatted_text(converse->get_output().c_str());
+ Common::String output = get_formatted_text(converse->get_output().c_str());
converse->print(output.c_str());
}
/* Print script text, resolving special symbols as they are encountered.
*/
-string ConverseInterpret::get_formatted_text(const char *c_str) {
+Common::String ConverseInterpret::get_formatted_text(const char *c_str) {
unsigned int i = 0;
char symbol[3] = { '\0', '\0', '\0' },
intval[16];
- string output;
+ Common::String output;
const uint32 len = strlen(c_str);
uint32 last_value = 0;
@@ -1181,7 +1181,7 @@ uint8 ConverseInterpret::npc_num(uint32 n) {
/* Returns true if the keywords list contains the input string, or contains an
* asterisk (matching any input).
*/
-bool ConverseInterpret::check_keywords(string keystr, string instr) {
+bool ConverseInterpret::check_keywords(Common::String keystr, Common::String instr) {
const char *strt_s = nullptr;
char *tok_s = nullptr, *cmp_s = nullptr;
if (keystr == "*")
@@ -1368,8 +1368,8 @@ converse_value ConverseInterpret::find_db_string(uint32 loc, const char *dstring
} while (is_print(db[++p]));
++p; // skip this unprintable now so it's not counted as an item
if (item) {
- string item_str = item;
- string find_str = dstring;
+ Common::String item_str = item;
+ Common::String find_str = dstring;
free(item);
// match keywords format: clamp item to 4 characters
if (item_str.size() > 4)
diff --git a/engines/ultima/nuvie/core/converse_interpret.h b/engines/ultima/nuvie/core/converse_interpret.h
index 3c753af34e0..82d74149540 100644
--- a/engines/ultima/nuvie/core/converse_interpret.h
+++ b/engines/ultima/nuvie/core/converse_interpret.h
@@ -27,7 +27,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::string;
using Std::vector;
/* Control and value opcodes for op() & evop() (U6) */
@@ -146,9 +145,9 @@ protected:
vector<struct in_val_s> in; // control values (input/instruction)
uint32 in_start;
- string text; // input text from script
- vector<Std::string> rstrings; // string value(s) returned by op
- string ystring; // modified by SETNAME, accessed with "$Y"
+ Common::String text; // input text from script
+ vector<Common::String> rstrings; // string value(s) returned by op
+ Common::String ystring; // modified by SETNAME, accessed with "$Y"
uint8 decl_v; // declared/initialized variable number
uint8 decl_t; // declared variable type: 0x00=none,0xb2=int,0xb3=string
Common::Stack<struct convi_frame_s *> *b_frame;
@@ -161,7 +160,7 @@ protected:
const char *get_rstr(uint32 sn) const {
return ((sn < rstrings.size()) ? rstrings[sn].c_str() : "");
}
- const string &get_ystr() const {
+ const Common::String &get_ystr() const {
return ystring;
}
void set_ystr(const char *s);
@@ -242,7 +241,7 @@ protected:
uint8 get_val_size(uint32 vi);
converse_value pop_val();
uint8 pop_val_size();
- const Std::string &get_text() const {
+ const Common::String &get_text() const {
return text;
}
void flush() {
@@ -255,7 +254,7 @@ protected:
void exec();
void do_ctrl();
void do_text();
- string get_formatted_text(const char *c_str);
+ Common::String get_formatted_text(const char *c_str);
converse_value pop_arg(Common::Stack<converse_typed_value> &vs);
converse_typed_value pop_typed_arg(Common::Stack<converse_typed_value> &vs);
virtual bool evop(Common::Stack<converse_typed_value> &i);
@@ -267,7 +266,7 @@ protected:
public:
virtual uint8 npc_num(uint32 n);//uint8 npc_num(uint32 n){return((n!=0xeb)?n:converse->npc_num);}
- bool check_keywords(Std::string keystr, Std::string instr);
+ bool check_keywords(Common::String keystr, Common::String instr);
bool var_input() const {
return decl_t != 0x00;
}
diff --git a/engines/ultima/nuvie/core/cursor.cpp b/engines/ultima/nuvie/core/cursor.cpp
index 3cfbf5b5ceb..48f7e15bdc3 100644
--- a/engines/ultima/nuvie/core/cursor.cpp
+++ b/engines/ultima/nuvie/core/cursor.cpp
@@ -33,7 +33,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::string;
using Std::vector;
@@ -45,7 +44,7 @@ Cursor::Cursor() : cursor_id(0), cur_x(-1), cur_y(-1), cleanup(nullptr),
/* Returns true if mouse pointers file was loaded.
*/
bool Cursor::init(const Configuration *c, Screen *s, nuvie_game_t game_type) {
- Std::string file;
+ Common::String file;
Common::Path filename;
bool enable_cursors;
diff --git a/engines/ultima/nuvie/core/cursor.h b/engines/ultima/nuvie/core/cursor.h
index d039b3a0ca8..10951cd8612 100644
--- a/engines/ultima/nuvie/core/cursor.h
+++ b/engines/ultima/nuvie/core/cursor.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_CURSOR_H
#define NUVIE_CORE_CURSOR_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index b2bf805b98f..b89412549bb 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -474,7 +474,7 @@ uint16 HitEffect::callback(uint16 msg, CallBack *caller, void *msg_data) {
return 0;
}
-TextEffect::TextEffect(Std::string text) { // default somewhat centered on player for cheat messages
+TextEffect::TextEffect(Common::String text) { // default somewhat centered on player for cheat messages
const MapWindow *map_window = game->get_map_window();
if (!map_window || map_window->Status() != WIDGET_VISIBLE) // scripted sequence like intro and intro menu
return;
@@ -488,7 +488,7 @@ TextEffect::TextEffect(Std::string text) { // default somewhat centered on playe
/*** TextEffect ***/
/* Print Text to MapWindow for duration
*/
-TextEffect::TextEffect(Std::string text, const MapCoord &location) {
+TextEffect::TextEffect(Common::String text, const MapCoord &location) {
add_anim(new TextAnim(text, location, 1500));
}
@@ -835,7 +835,7 @@ void MissileEffect::hit_blocking() {
/*** SleepEffect ***/
/* The TimedAdvance is started after the fade-out completes. */
-SleepEffect::SleepEffect(Std::string until)
+SleepEffect::SleepEffect(Common::String until)
: timer(nullptr),
stop_hour(0),
stop_minute(0),
@@ -1658,7 +1658,7 @@ TextInputEffect::TextInputEffect(const char *allowed_chars, bool can_escape) {
/* The effect ends when this is called. (if input is correct) */
uint16 TextInputEffect::callback(uint16 msg, CallBack *caller, void *data) {
if (msg == MESG_INPUT_READY) {
- input = *(Std::string *)data;
+ input = *(Common::String *)data;
game->unpause_world();
delete_self();
}
diff --git a/engines/ultima/nuvie/core/effect.h b/engines/ultima/nuvie/core/effect.h
index ed1f0a35465..944ed35c042 100644
--- a/engines/ultima/nuvie/core/effect.h
+++ b/engines/ultima/nuvie/core/effect.h
@@ -235,8 +235,8 @@ public:
class TextEffect : public Effect {
public:
- TextEffect(Std::string text);
- TextEffect(Std::string text, const MapCoord &location);
+ TextEffect(Common::String text);
+ TextEffect(Common::String text, const MapCoord &location);
uint16 callback(uint16 msg, CallBack *caller, void *data) override;
};
@@ -387,9 +387,9 @@ class PaletteEffect : public TimedEffect {
class SleepEffect : public Effect {
TimedAdvance *timer; // timed event
uint8 stop_hour, stop_minute; // sleep until this time
- Std::string stop_time;
+ Common::String stop_time;
public:
- SleepEffect(Std::string until);
+ SleepEffect(Common::String until);
SleepEffect(uint8 to_hour);
~SleepEffect() override;
@@ -601,13 +601,13 @@ public:
/* Gather text from scroll input then continue. */
class TextInputEffect: public Effect {
- Std::string input;
+ Common::String input;
public:
/* Called by the Effect handler when input is available. */
uint16 callback(uint16 msg, CallBack *caller, void *data) override;
TextInputEffect(const char *allowed_chars, bool can_escape);
~TextInputEffect() override { }
- Std::string get_input() {
+ Common::String get_input() {
return input;
}
};
diff --git a/engines/ultima/nuvie/core/egg_manager.h b/engines/ultima/nuvie/core/egg_manager.h
index bca500c0633..210ac69ba6c 100644
--- a/engines/ultima/nuvie/core/egg_manager.h
+++ b/engines/ultima/nuvie/core/egg_manager.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_EGG_MANAGER_H
#define NUVIE_CORE_EGG_MANAGER_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/obj_manager.h"
namespace Ultima {
diff --git a/engines/ultima/nuvie/core/events.cpp b/engines/ultima/nuvie/core/events.cpp
index 093e4ffd688..4bf9ce3a5c6 100644
--- a/engines/ultima/nuvie/core/events.cpp
+++ b/engines/ultima/nuvie/core/events.cpp
@@ -62,8 +62,6 @@ namespace Nuvie {
Events *Events::g_events;
-using Std::string;
-
EventInput_s::~EventInput_s() {
if (target_init) delete target_init;
if (str) delete str;
@@ -1507,7 +1505,7 @@ bool Events::actor_exists(const Actor *a) const {
void Events::alt_code_input(const char *in) {
ActorManager *am = game->get_actor_manager();
Actor *a = am->get_actor((uint8) strtol(in, nullptr, 10));
- static string teleport_string = "";
+ static Common::String teleport_string = "";
static Obj obj;
uint8 a_num = 0;
switch (active_alt_code) {
@@ -2824,7 +2822,7 @@ bool Events::rest() {
}
scroll->display_string("Rest");
- string err_str;
+ Common::String err_str;
if (!player->get_party()->can_rest(err_str)) {
scroll->display_string(err_str);
scroll->display_string("\n");
@@ -3027,7 +3025,7 @@ void Events::doAction() {
}
assert(scroll->has_input()); // doAction should only be called when input is ready
assert(input.str == 0);
- input.str = new string(scroll->get_input());
+ input.str = new Common::String(scroll->get_input());
endAction();
doAction();
} else if (input.select_from_inventory) // some redirection here...
diff --git a/engines/ultima/nuvie/core/events.h b/engines/ultima/nuvie/core/events.h
index a7df2442fcd..36385ba5696 100644
--- a/engines/ultima/nuvie/core/events.h
+++ b/engines/ultima/nuvie/core/events.h
@@ -23,7 +23,7 @@
#define NUVIE_CORE_EVENT_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/misc/call_back.h"
#include "ultima/nuvie/keybinding/keys_enum.h"
#include "ultima/nuvie/core/obj_manager.h"
@@ -161,7 +161,7 @@ struct EventInput_s {
Common::KeyCode key; // last key entered, if capturing input
ActionKeyType action_key_type; // last ActionKeyType entered if capturing input
MapCoord *loc; // target location, or direction if relative ???
- Std::string *str; // ???
+ Common::String *str; // ???
// };
void set_loc(const MapCoord &c);
EventInput_s() : loc(0), str(0), obj(0), actor(0), get_direction(false), get_text(false),
diff --git a/engines/ultima/nuvie/core/game.cpp b/engines/ultima/nuvie/core/game.cpp
index 37f537ea5d5..ce0d8649af6 100644
--- a/engines/ultima/nuvie/core/game.cpp
+++ b/engines/ultima/nuvie/core/game.cpp
@@ -119,7 +119,7 @@ Game::Game(Configuration *cfg, Events *evt, Screen *scr, GUI *g, nuvie_game_t ty
game_style = NUVIE_STYLE_ORIG_PLUS_CUTOFF_MAP;
}
- string game_position;
+ Common::String game_position;
config->value("config/video/game_position", game_position, "center");
if (game_position == "upper_left")
@@ -314,7 +314,7 @@ bool Game::loadGame(Script *s) {
command_bar->Show();
else {
bool show;
- Std::string show_cb;
+ Common::String show_cb;
config->value(config_get_game_key(config) + "/show_orig_style_cb", show_cb, "default");
if (show_cb == "default") {
if (is_new_style())
@@ -350,7 +350,7 @@ void Game::init_converse_gump_settings() {
else {
converse_gump_type = get_converse_gump_type_from_config(config);
}
- Std::string width_str;
+ Common::String width_str;
int gump_w = get_game_width();
if (game_type == NUVIE_GAME_MD)
@@ -445,7 +445,7 @@ void Game::init_cursor() {
}
void Game::init_game_style() {
- string game_style_str;
+ Common::String game_style_str;
config->value("config/video/game_style", game_style_str, "original");
if (game_style_str == "new")
game_style = NUVIE_STYLE_NEW;
diff --git a/engines/ultima/nuvie/core/game.h b/engines/ultima/nuvie/core/game.h
index bff8e52d233..569bd155571 100644
--- a/engines/ultima/nuvie/core/game.h
+++ b/engines/ultima/nuvie/core/game.h
@@ -23,7 +23,7 @@
#define NUVIE_CORE_GAME_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
namespace Ultima {
diff --git a/engines/ultima/nuvie/core/magic.cpp b/engines/ultima/nuvie/core/magic.cpp
index eb8dc9eefdf..9fcb6045f1e 100644
--- a/engines/ultima/nuvie/core/magic.cpp
+++ b/engines/ultima/nuvie/core/magic.cpp
@@ -285,7 +285,7 @@ bool Magic::cast() {
}
void Magic::display_spell_incantation(uint8 index) {
- string incantation_str;
+ Common::String incantation_str;
for (int i = 0; spell[index]->invocation[i] != '\0'; i++)
incantation_str += syllable[spell[index]->invocation[i] - Common::KEYCODE_a];
@@ -306,7 +306,7 @@ void Magic::display_ingredients(uint8 index) {
event->scroll->display_string("None\n\n");
return;
}
- string list;
+ Common::String list;
for (int shift = 0; shift < 8; shift++) {
if (1 << shift & spell[index]->reagents) {
list += " ";
@@ -321,7 +321,7 @@ void Magic::display_ingredients(uint8 index) {
}
void Magic::cast_spell_directly(uint8 spell_num) {
- string lua = "run_magic_script(\"";
+ Common::String lua = "run_magic_script(\"";
lua += spell[spell_num]->invocation;
lua += "\")";
diff --git a/engines/ultima/nuvie/core/map.cpp b/engines/ultima/nuvie/core/map.cpp
index 621b1527bbc..d825649b9c1 100644
--- a/engines/ultima/nuvie/core/map.cpp
+++ b/engines/ultima/nuvie/core/map.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/files/nuvie_io_file.h"
@@ -451,7 +451,7 @@ bool Map::has_roof(uint16 x, uint16 y, uint8 level) const {
}
Common::Path Map::getRoofDataFilename() const {
- Std::string game_type, tmp;
+ Common::String game_type, tmp;
Common::Path datadir, path, mapfile;
config->value("config/datadir", tmp, "");
@@ -468,7 +468,7 @@ Common::Path Map::getRoofDataFilename() const {
}
Common::Path Map::getRoofTilesetFilename() const {
- Std::string tmp;
+ Common::String tmp;
Common::Path datadir;
Common::Path imagefile;
Common::Path path;
diff --git a/engines/ultima/nuvie/core/map.h b/engines/ultima/nuvie/core/map.h
index e68fa1219a9..5307eebc5ac 100644
--- a/engines/ultima/nuvie/core/map.h
+++ b/engines/ultima/nuvie/core/map.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_MAP_H
#define NUVIE_CORE_MAP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/obj_manager.h"
namespace Ultima {
diff --git a/engines/ultima/nuvie/core/obj_manager.cpp b/engines/ultima/nuvie/core/obj_manager.cpp
index 776300e72bd..06aa90d2a09 100644
--- a/engines/ultima/nuvie/core/obj_manager.cpp
+++ b/engines/ultima/nuvie/core/obj_manager.cpp
@@ -74,14 +74,14 @@ ObjManager::ObjManager(const Configuration *cfg, TileManager *tm, EggManager *em
//save the egg tile_num incase we want to switch egg display on again.
egg_tile_num = get_obj_tile_num(obj_egg_table[game_type]);
- Std::string show_eggs_key = config_get_game_key(config);
+ Common::String show_eggs_key = config_get_game_key(config);
show_eggs_key.append("/show_eggs");
config->value(show_eggs_key, show_eggs);
//if(!show_eggs)
// show_egg_objs(false);
- Std::string custom_tile_str;
+ Common::String custom_tile_str;
config->value(config_get_game_key(config) + "/custom_actor_tiles", custom_tile_str, "default");
if (custom_tile_str == "default") {
if (Game::get_game()->is_new_style())
diff --git a/engines/ultima/nuvie/core/party.cpp b/engines/ultima/nuvie/core/party.cpp
index 2af67ff762e..f4cd8caca5e 100644
--- a/engines/ultima/nuvie/core/party.cpp
+++ b/engines/ultima/nuvie/core/party.cpp
@@ -59,7 +59,7 @@ Party::~Party() {
}
bool Party::init(Game *g, ActorManager *am) {
- Std::string formation_string;
+ Common::String formation_string;
game = g;
actor_manager = am;
@@ -851,7 +851,7 @@ void Party::rest_sleep(uint8 hours, sint16 guard) {
new TimedRest(hours, guard >= 0 ? member[guard].actor : 0, rest_campfire);
}
-bool Party::can_rest(Std::string &err_str) {
+bool Party::can_rest(Common::String &err_str) {
Map *map_ = game->get_game_map();
Player *player = game->get_player();
Actor *pActor = player->get_actor();
diff --git a/engines/ultima/nuvie/core/party.h b/engines/ultima/nuvie/core/party.h
index a8d9e62eed3..c5586a893f6 100644
--- a/engines/ultima/nuvie/core/party.h
+++ b/engines/ultima/nuvie/core/party.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_PARTY_H
#define NUVIE_CORE_PARTY_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/obj_manager.h"
#include "ultima/nuvie/core/map.h"
@@ -205,7 +205,7 @@ public:
}
void rest_gather();
void rest_sleep(uint8 hours, sint16 guard);
- bool can_rest(Std::string &err_str);
+ bool can_rest(Common::String &err_str);
void set_combat_target(uint8 member_num, Actor *target);
void set_combat_target(uint8 member_num, MapCoord target);
diff --git a/engines/ultima/nuvie/core/player.cpp b/engines/ultima/nuvie/core/player.cpp
index 0a5c05e7fdf..ffe730535cd 100644
--- a/engines/ultima/nuvie/core/player.cpp
+++ b/engines/ultima/nuvie/core/player.cpp
@@ -201,7 +201,7 @@ void Player::set_actor(Actor *new_actor) {
if (same_actor)
return;
actor_manager->set_player(actor);
- Std::string prompt = get_name();
+ Common::String prompt = get_name();
if (game_type == NUVIE_GAME_U6) {
prompt += ":\n";
diff --git a/engines/ultima/nuvie/core/tile_manager.h b/engines/ultima/nuvie/core/tile_manager.h
index 5e28e090c45..561ed26ecc2 100644
--- a/engines/ultima/nuvie/core/tile_manager.h
+++ b/engines/ultima/nuvie/core/tile_manager.h
@@ -23,7 +23,7 @@
#define NUVIE_CORE_TILE_MANAGER_H
#include "ultima/nuvie/core/nuvie_defs.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
diff --git a/engines/ultima/nuvie/core/timed_event.cpp b/engines/ultima/nuvie/core/timed_event.cpp
index 5de44040fda..bbd944d8710 100644
--- a/engines/ultima/nuvie/core/timed_event.cpp
+++ b/engines/ultima/nuvie/core/timed_event.cpp
@@ -546,7 +546,7 @@ TimedAdvance::TimedAdvance(uint8 hours, uint16 r)
/* Advance to time indicated by timestring, of the format "HH:MM".
*/
-TimedAdvance::TimedAdvance(Std::string timestring, uint16 r)
+TimedAdvance::TimedAdvance(Common::String timestring, uint16 r)
: TimedCallback(nullptr, nullptr, 1000 / TIMEADVANCE_PER_SECOND, true),
_clock(Game::get_game()->get_clock()),
minutes_this_hour(0), minutes(0) {
@@ -626,7 +626,7 @@ bool TimedAdvance::time_passed() const {
/* Set hour and minute from "HH:MM" string.
*/
-void TimedAdvance::get_time_from_string(uint8 &hour, uint8 &minute, Std::string timestring) {
+void TimedAdvance::get_time_from_string(uint8 &hour, uint8 &minute, Common::String timestring) {
char *minute_s = nullptr;
char *hour_s = scumm_strdup(timestring.c_str());
for (uint32 c = 0; c < strlen(hour_s); c++)
diff --git a/engines/ultima/nuvie/core/timed_event.h b/engines/ultima/nuvie/core/timed_event.h
index f7869eeda56..c522e53b06e 100644
--- a/engines/ultima/nuvie/core/timed_event.h
+++ b/engines/ultima/nuvie/core/timed_event.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_TIMED_EVENT_H
#define NUVIE_CORE_TIMED_EVENT_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/misc/call_back.h"
#include "ultima/nuvie/core/obj_manager.h"
@@ -119,7 +119,7 @@ public:
/* Print to stdout. (timer test)
*/
class TimedMessage : public TimedEvent {
- Std::string msg;
+ Common::String msg;
public:
TimedMessage(uint32 reltime, const char *m, bool repeating = false)
: TimedEvent(reltime), msg(m) {
@@ -239,14 +239,14 @@ protected:
public:
TimedAdvance(uint8 hours, uint16 r = 60);
- TimedAdvance(Std::string timestring, uint16 r = 60); // "HH:MM"
+ TimedAdvance(Common::String timestring, uint16 r = 60); // "HH:MM"
~TimedAdvance() override { }
void init(uint16 min, uint16 r); // start time advance
void timed(uint32 evtime) override;
bool time_passed() const; // returns true if stop time has passed
- void get_time_from_string(uint8 &hour, uint8 &minute, Std::string timestring);
+ void get_time_from_string(uint8 &hour, uint8 &minute, Common::String timestring);
};
diff --git a/engines/ultima/nuvie/core/weather.cpp b/engines/ultima/nuvie/core/weather.cpp
index d215a750dda..2d62a3ac42e 100644
--- a/engines/ultima/nuvie/core/weather.cpp
+++ b/engines/ultima/nuvie/core/weather.cpp
@@ -44,7 +44,7 @@ namespace Nuvie {
Weather::Weather(const Configuration *cfg, GameClock *c, nuvie_game_t type)
: config(cfg), _clock(c), gametype(type), wind_dir(NUVIE_DIR_NONE),
wind_timer(nullptr) {
- string s;
+ Common::String s;
config->value(config_get_game_key(config) + "/displayed_wind_dir", s, "from");
if (s == "to")
display_from_wind_dir = false;
@@ -177,7 +177,7 @@ bool Weather::is_moon_visible() const {
return false;
}
-string Weather::get_wind_dir_str() const {
+Common::String Weather::get_wind_dir_str() const {
if (display_from_wind_dir) {
static const char from_names[9][3] = {"N", "E", "S", "W", "NE", "SE", "SW", "NW", "C"};
return from_names[wind_dir];
diff --git a/engines/ultima/nuvie/core/weather.h b/engines/ultima/nuvie/core/weather.h
index 397564c80a3..918172a435c 100644
--- a/engines/ultima/nuvie/core/weather.h
+++ b/engines/ultima/nuvie/core/weather.h
@@ -36,7 +36,6 @@ class GameClock;
class GameTimedCallback;
using Std::list;
-using Std::string;
//our callbacks
@@ -62,7 +61,7 @@ public:
bool load(NuvieIO *objlist);
bool save(NuvieIO *objlist);
- Std::string get_wind_dir_str() const;
+ Common::String get_wind_dir_str() const;
NuvieDir get_wind_dir() const {
return wind_dir;
}
diff --git a/engines/ultima/nuvie/files/nuvie_bmp_file.cpp b/engines/ultima/nuvie/files/nuvie_bmp_file.cpp
index dd06eb6a408..a89611462f4 100644
--- a/engines/ultima/nuvie/files/nuvie_bmp_file.cpp
+++ b/engines/ultima/nuvie/files/nuvie_bmp_file.cpp
@@ -220,7 +220,7 @@ void NuvieBmpFile::write8BitData(NuvieIOFileWrite *file) {
}
}
-bool NuvieBmpFile::handleError(Std::string error) {
+bool NuvieBmpFile::handleError(Common::String error) {
if (data) {
free(data);
data = nullptr;
diff --git a/engines/ultima/nuvie/files/nuvie_bmp_file.h b/engines/ultima/nuvie/files/nuvie_bmp_file.h
index f04a5ea33e2..eb801389ff1 100644
--- a/engines/ultima/nuvie/files/nuvie_bmp_file.h
+++ b/engines/ultima/nuvie/files/nuvie_bmp_file.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_FILES_NUVIE_BMP_FILE_H
#define NUVIE_FILES_NUVIE_BMP_FILE_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/files/nuvie_io_file.h"
#include "ultima/nuvie/core/tile_manager.h"
@@ -87,7 +87,7 @@ public:
Graphics::ManagedSurface *getSdlSurface32(const Common::Path &filename);
private:
- bool handleError(Std::string error);
+ bool handleError(Common::String error);
void write8BitData(NuvieIOFileWrite *file);
};
diff --git a/engines/ultima/nuvie/files/nuvie_file_list.cpp b/engines/ultima/nuvie/files/nuvie_file_list.cpp
index 5241fd3c6bd..221d299958b 100644
--- a/engines/ultima/nuvie/files/nuvie_file_list.cpp
+++ b/engines/ultima/nuvie/files/nuvie_file_list.cpp
@@ -20,7 +20,7 @@
*/
#include "ultima/nuvie/core/nuvie_defs.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/gui/widgets/console.h"
#include "ultima/nuvie/misc/u6_misc.h"
#include "ultima/nuvie/files/nuvie_file_list.h"
@@ -41,7 +41,7 @@ bool NuvieFileList::open(const Common::Path &directory, const char *search, uint
sort_mode = s_mode;
if (!arcMember || !arcMember->isDirectory()) {
- ConsoleAddWarning(Std::string("Failed to open ") + directory.toString());
+ ConsoleAddWarning(Common::String("Failed to open ") + directory.toString());
return false;
}
@@ -49,7 +49,7 @@ bool NuvieFileList::open(const Common::Path &directory, const char *search, uint
arcMember->listChildren(children, search);
if (children.empty()) {
- ConsoleAddWarning(Std::string("Failed to get children of ") + directory.toString());
+ ConsoleAddWarning(Common::String("Failed to get children of ") + directory.toString());
return false;
};
@@ -74,7 +74,7 @@ bool NuvieFileList::add_filename(const Common::String &fileName) {
return true;
}
-const Std::string *NuvieFileList::get_latest() const {
+const Common::String *NuvieFileList::get_latest() const {
Std::list<NuvieFileDesc>::const_iterator iter;
iter = file_list.begin();
diff --git a/engines/ultima/nuvie/files/nuvie_file_list.h b/engines/ultima/nuvie/files/nuvie_file_list.h
index 4b54193d86a..725bf790164 100644
--- a/engines/ultima/nuvie/files/nuvie_file_list.h
+++ b/engines/ultima/nuvie/files/nuvie_file_list.h
@@ -22,14 +22,13 @@
#ifndef NUVIE_FILES_NUVIE_FILE_LIST_H
#define NUVIE_FILES_NUVIE_FILE_LIST_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "common/fs.h"
namespace Ultima {
namespace Nuvie {
using Std::list;
-using Std::string;
#define NUVIE_SORT_TIME_DESC 0x1
@@ -41,7 +40,7 @@ class Configuration;
class NuvieFileDesc {
public:
- Std::string filename;
+ Common::String filename;
uint32 m_time;
bool operator<(const NuvieFileDesc &rhs) const {
@@ -66,8 +65,8 @@ public:
bool open(const Common::Path &directory, const char *restrict, uint8 sort_mode);
- Std::string *next();
- const Std::string *get_latest() const;
+ Common::String *next();
+ const Common::String *get_latest() const;
uint32 get_num_files() const;
const Std::list<NuvieFileDesc> &get_filelist() const;
diff --git a/engines/ultima/nuvie/files/nuvie_io_file.h b/engines/ultima/nuvie/files/nuvie_io_file.h
index 38bbbf9e2d8..7600306828d 100644
--- a/engines/ultima/nuvie/files/nuvie_io_file.h
+++ b/engines/ultima/nuvie/files/nuvie_io_file.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_FILES_NUVIE_IO_FILE_H
#define NUVIE_FILES_NUVIE_IO_FILE_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/files/nuvie_io.h"
#include "common/file.h"
#include "common/memstream.h"
diff --git a/engines/ultima/nuvie/files/tmx_map.cpp b/engines/ultima/nuvie/files/tmx_map.cpp
index eb35019fd14..bcd29278962 100644
--- a/engines/ultima/nuvie/files/tmx_map.cpp
+++ b/engines/ultima/nuvie/files/tmx_map.cpp
@@ -73,10 +73,10 @@ void TMXMap::writeRoofTileset(uint8 level) {
free(buf);
}
-void TMXMap::writeLayer(NuvieIOFileWrite *tmx, uint16 sideLength, Std::string layerName,
+void TMXMap::writeLayer(NuvieIOFileWrite *tmx, uint16 sideLength, Common::String layerName,
uint16 gidOffset, uint16 bitsPerTile, const unsigned char *data) {
- Std::string slen = sint32ToString((sint32)sideLength);
- Std::string header = " <layer name=\"" + layerName + "\" width=\"" + slen + "\" height=\""
+ Common::String slen = sint32ToString((sint32)sideLength);
+ Common::String header = " <layer name=\"" + layerName + "\" width=\"" + slen + "\" height=\""
+ slen + "\">\n";
header += " <data encoding=\"csv\">\n";
@@ -101,14 +101,14 @@ void TMXMap::writeLayer(NuvieIOFileWrite *tmx, uint16 sideLength, Std::string la
tmx->write1('\n');
}
- Std::string footer = " </data>\n";
+ Common::String footer = " </data>\n";
footer += " </layer>\n";
tmx->writeBuf((const unsigned char *)footer.c_str(), footer.size());
}
void TMXMap::writeObjectLayer(NuvieIOFileWrite *tmx, uint8 level) {
- Std::string xml = "<objectgroup name=\"Object Layer\">\n";
+ Common::String xml = "<objectgroup name=\"Object Layer\">\n";
tmx->writeBuf((const unsigned char *)xml.c_str(), xml.size());
writeObjects(tmx, level, true, false);
@@ -132,14 +132,14 @@ bool TMXMap::canDrawTile(Tile *t, bool forceLower, bool toptile) {
return true;
}
-Std::string TMXMap::writeObjectTile(Obj *obj, Std::string nameSuffix, uint16 tile_num, uint16 x, uint16 y, bool forceLower, bool toptile) {
+Common::String TMXMap::writeObjectTile(Obj *obj, Common::String nameSuffix, uint16 tile_num, uint16 x, uint16 y, bool forceLower, bool toptile) {
Tile *t = tile_manager->get_tile(tile_num);
if (canDrawTile(t, forceLower, toptile)) {
- return " <object name=\"" + encode_xml_entity(Std::string(obj_manager->get_obj_name(obj))) + nameSuffix + "\" gid=\"" + sint32ToString(tile_num + 1) + "\" x=\"" + sint32ToString(x * 16) + "\" y=\"" + sint32ToString((y + 1) * 16) + "\" width=\"16\" height=\"16\"/>\n";
+ return " <object name=\"" + encode_xml_entity(Common::String(obj_manager->get_obj_name(obj))) + nameSuffix + "\" gid=\"" + sint32ToString(tile_num + 1) + "\" x=\"" + sint32ToString(x * 16) + "\" y=\"" + sint32ToString((y + 1) * 16) + "\" width=\"16\" height=\"16\"/>\n";
}
- return Std::string();
+ return Common::String();
}
void TMXMap::writeObjects(NuvieIOFileWrite *tmx, uint8 level, bool forceLower, bool toptiles) {
@@ -152,9 +152,9 @@ void TMXMap::writeObjects(NuvieIOFileWrite *tmx, uint8 level, bool forceLower, b
for (U6Link *link = list->start(); link != nullptr; link = link->next) {
Obj *obj = (Obj *)link->data;
Tile *t = tile_manager->get_original_tile(obj_manager->get_obj_tile_num(obj->obj_n) + obj->frame_n);
- Std::string s;
+ Common::String s;
if (canDrawTile(t, forceLower, toptiles)) {
- s = " <object name=\"" + encode_xml_entity(Std::string(obj_manager->get_obj_name(obj))) + "\" gid=\"" + sint32ToString(obj_manager->get_obj_tile_num(obj->obj_n) + obj->frame_n + 1) + "\" x=\"" + sint32ToString((x) * 16) + "\" y=\"" + sint32ToString((y + 1) * 16) + "\" width=\"16\" height=\"16\">\n";
+ s = " <object name=\"" + encode_xml_entity(Common::String(obj_manager->get_obj_name(obj))) + "\" gid=\"" + sint32ToString(obj_manager->get_obj_tile_num(obj->obj_n) + obj->frame_n + 1) + "\" x=\"" + sint32ToString((x) * 16) + "\" y=\"" + sint32ToString((y + 1) * 16) + "\" width=\"16\" height=\"16\">\n";
s += " <properties>\n";
s += " <property name=\"obj_n\" value=\"" + sint32ToString(obj->obj_n) + "\"/>\n";
s += " <property name=\"frame_n\" value=\"" + sint32ToString(obj->frame_n) + "\"/>\n";
@@ -191,11 +191,11 @@ bool TMXMap::exportMapLevel(uint8 level) {
mapdata = map->get_map_data(level);
Common::String level_string = Common::String::format("%d", level); // 'nn\0'
Common::Path filename;
- build_path(savedir, savename + "_" + Std::string(level_string.c_str()) + ".tmx", filename);
+ build_path(savedir, savename + "_" + Common::String(level_string.c_str()) + ".tmx", filename);
tmx.open(filename);
- Std::string swidth = sint32ToString((sint32)width);
- Std::string header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+ Common::String swidth = sint32ToString((sint32)width);
+ Common::String header = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
header +=
"<map version=\"1.0\" orientation=\"orthogonal\" renderorder=\"right-down\" width=\""
+ swidth + "\" height=\"" + swidth
@@ -223,7 +223,7 @@ bool TMXMap::exportMapLevel(uint8 level) {
writeLayer(&tmx, width, "RoofLayer", 2047, 16, (const unsigned char *)map->get_roof_data(level));
}
- Std::string footer = "</map>\n";
+ Common::String footer = "</map>\n";
tmx.writeBuf((const unsigned char *)footer.c_str(), footer.size());
@@ -235,14 +235,14 @@ bool TMXMap::exportMapLevel(uint8 level) {
return true;
}
-Std::string TMXMap::sint32ToString(sint32 value) {
+Common::String TMXMap::sint32ToString(sint32 value) {
char buf[12];
snprintf(buf, sizeof(buf), "%d", value);
- return Std::string(buf);
+ return Common::String(buf);
}
-Std::string TMXMap::boolToString(bool value) {
- return value ? Std::string("true") : Std::string("false");
+Common::String TMXMap::boolToString(bool value) {
+ return value ? Common::String("true") : Common::String("false");
}
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/files/tmx_map.h b/engines/ultima/nuvie/files/tmx_map.h
index 4f1a4fd7cc6..11af5d465f7 100644
--- a/engines/ultima/nuvie/files/tmx_map.h
+++ b/engines/ultima/nuvie/files/tmx_map.h
@@ -41,7 +41,7 @@ private:
Map *map;
ObjManager *obj_manager;
Common::Path savedir;
- Std::string savename;
+ Common::String savename;
//nuvie_game_t game_type;
public:
@@ -51,13 +51,13 @@ public:
private:
bool exportMapLevel(uint8 level);
void writeRoofTileset(uint8 level);
- void writeLayer(NuvieIOFileWrite *tmx, uint16 width, Std::string layerName,
+ void writeLayer(NuvieIOFileWrite *tmx, uint16 width, Common::String layerName,
uint16 gidOffset, uint16 bitsPerTile, const unsigned char *data);
void writeObjectLayer(NuvieIOFileWrite *tmx, uint8 level);
void writeObjects(NuvieIOFileWrite *tmx, uint8 level, bool forceLower, bool toptiles);
- Std::string writeObjectTile(Obj *obj, Std::string nameSuffix, uint16 tile_num, uint16 x, uint16 y, bool forceLower, bool toptile);
- Std::string sint32ToString(sint32 value);
- Std::string boolToString(bool value);
+ Common::String writeObjectTile(Obj *obj, Common::String nameSuffix, uint16 tile_num, uint16 x, uint16 y, bool forceLower, bool toptile);
+ Common::String sint32ToString(sint32 value);
+ Common::String boolToString(bool value);
bool canDrawTile(Tile *t, bool forceLower, bool toptile);
};
diff --git a/engines/ultima/nuvie/files/u6_bmp.cpp b/engines/ultima/nuvie/files/u6_bmp.cpp
index 9f23eae1192..77c719e1cd2 100644
--- a/engines/ultima/nuvie/files/u6_bmp.cpp
+++ b/engines/ultima/nuvie/files/u6_bmp.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/files/u6_lzw.h"
#include "ultima/nuvie/files/u6_bmp.h"
diff --git a/engines/ultima/nuvie/files/u6_bmp.h b/engines/ultima/nuvie/files/u6_bmp.h
index 290bfd1fb49..42823192df4 100644
--- a/engines/ultima/nuvie/files/u6_bmp.h
+++ b/engines/ultima/nuvie/files/u6_bmp.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_FILES_U6BMP_H
#define NUVIE_FILES_U6BMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/files/u6_shape.h"
diff --git a/engines/ultima/nuvie/files/u6_lib_n.cpp b/engines/ultima/nuvie/files/u6_lib_n.cpp
index 471aa6c9d33..ee4921c49a7 100644
--- a/engines/ultima/nuvie/files/u6_lib_n.cpp
+++ b/engines/ultima/nuvie/files/u6_lib_n.cpp
@@ -347,7 +347,7 @@ void U6Lib_n::add_item(uint32 offset32, const char *name) {
items = (U6LibItem *)nuvie_realloc(items, sizeof(U6LibItem) * (num_offsets + 1));
U6LibItem *item = &items[num_offsets];
item->offset = offset32;
- item->name = new string(name);
+ item->name = new Common::String(name);
item->size = 0;
item->uncomp_size = 0;
item->flag = 0; // uncompressed
diff --git a/engines/ultima/nuvie/files/u6_lib_n.h b/engines/ultima/nuvie/files/u6_lib_n.h
index ea25c74448d..0c793981676 100644
--- a/engines/ultima/nuvie/files/u6_lib_n.h
+++ b/engines/ultima/nuvie/files/u6_lib_n.h
@@ -23,13 +23,12 @@
#define NUVIE_FILES_U6LIB_N_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "common/stream.h"
namespace Ultima {
namespace Nuvie {
-using Std::string;
//using Std::vector;
class NuvieIO;
@@ -39,7 +38,7 @@ struct U6LibItem {
uint8 flag;
uint32 uncomp_size;
uint32 size;
- string *name;
+ Common::String *name;
unsigned char *data; // for writing or cache
};
@@ -94,7 +93,7 @@ protected:
class U6ConverseLib: U6Lib_n {
private:
uint32 zero_offset_count;
- string *conversefile;
+ Common::String *conversefile;
};
#endif
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/files/u6_lzw.cpp b/engines/ultima/nuvie/files/u6_lzw.cpp
index e92b516af88..157ca893b0d 100644
--- a/engines/ultima/nuvie/files/u6_lzw.cpp
+++ b/engines/ultima/nuvie/files/u6_lzw.cpp
@@ -28,7 +28,7 @@
// This program decompresses Ultima_6-style LZW-compressed files
// =============================================================
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/files/nuvie_io_file.h"
#include "ultima/nuvie/files/u6_lzw.h"
diff --git a/engines/ultima/nuvie/files/u6_lzw.h b/engines/ultima/nuvie/files/u6_lzw.h
index 5f66c85ea68..a110eeb66a3 100644
--- a/engines/ultima/nuvie/files/u6_lzw.h
+++ b/engines/ultima/nuvie/files/u6_lzw.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_FILES_U6_LZW_H
#define NUVIE_FILES_U6_LZW_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
diff --git a/engines/ultima/nuvie/files/u6_shape.h b/engines/ultima/nuvie/files/u6_shape.h
index 6289ed19844..4039738ff60 100644
--- a/engines/ultima/nuvie/files/u6_shape.h
+++ b/engines/ultima/nuvie/files/u6_shape.h
@@ -27,7 +27,7 @@
* Includes
* ==========
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
diff --git a/engines/ultima/nuvie/files/utils.cpp b/engines/ultima/nuvie/files/utils.cpp
index 1e6f3b85854..c78c78c242a 100644
--- a/engines/ultima/nuvie/files/utils.cpp
+++ b/engines/ultima/nuvie/files/utils.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/files/utils.h"
#include "ultima/nuvie/nuvie.h"
#include "common/file.h"
diff --git a/engines/ultima/nuvie/fonts/bmp_font.cpp b/engines/ultima/nuvie/fonts/bmp_font.cpp
index 935f0ecb92a..a6fb25cd5a9 100644
--- a/engines/ultima/nuvie/fonts/bmp_font.cpp
+++ b/engines/ultima/nuvie/fonts/bmp_font.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/files/nuvie_io_file.h"
#include "ultima/nuvie/conf/configuration.h"
diff --git a/engines/ultima/nuvie/fonts/conv_font.cpp b/engines/ultima/nuvie/fonts/conv_font.cpp
index dcd58c7be48..3c2d3900952 100644
--- a/engines/ultima/nuvie/fonts/conv_font.cpp
+++ b/engines/ultima/nuvie/fonts/conv_font.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/screen/screen.h"
#include "ultima/nuvie/fonts/conv_font.h"
diff --git a/engines/ultima/nuvie/fonts/font.h b/engines/ultima/nuvie/fonts/font.h
index 6271345cfc7..c41ecbbba4d 100644
--- a/engines/ultima/nuvie/fonts/font.h
+++ b/engines/ultima/nuvie/fonts/font.h
@@ -62,7 +62,7 @@ public:
default_highlight_color = color;
}
-// bool drawString(Screen *screen, Std::string str, uint16 x, uint16 y);
+// bool drawString(Screen *screen, Common::String str, uint16 x, uint16 y);
uint16 drawString(Screen *screen, const char *str, uint16 x, uint16 y);
uint16 drawString(Screen *screen, const char *str, uint16 x, uint16 y, uint8 color, uint8 highlight_color);
uint16 drawString(Screen *screen, const char *str, uint16 string_len, uint16 x, uint16 y, uint8 color, uint8 highlight_color);
diff --git a/engines/ultima/nuvie/fonts/font_manager.cpp b/engines/ultima/nuvie/fonts/font_manager.cpp
index a38f1c082ec..0343a40f24c 100644
--- a/engines/ultima/nuvie/fonts/font_manager.cpp
+++ b/engines/ultima/nuvie/fonts/font_manager.cpp
@@ -98,7 +98,7 @@ bool FontManager::initU6() {
return true;
}
-bool FontManager::initWOU(Std::string filename) {
+bool FontManager::initWOU(Common::String filename) {
WOUFont *font;
Common::Path path;
U6Lib_n lib_file;
diff --git a/engines/ultima/nuvie/fonts/font_manager.h b/engines/ultima/nuvie/fonts/font_manager.h
index 02686716148..9cad18ad3a4 100644
--- a/engines/ultima/nuvie/fonts/font_manager.h
+++ b/engines/ultima/nuvie/fonts/font_manager.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_FONTS_FONT_MANAGER_H
#define NUVIE_FONTS_FONT_MANAGER_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
@@ -61,7 +61,7 @@ public:
protected:
bool initU6();
- bool initWOU(Std::string filename);
+ bool initWOU(Common::String filename);
bool initWOUSystemFont();
bool initConvFonts(nuvie_game_t game_type);
};
diff --git a/engines/ultima/nuvie/gui/gui.cpp b/engines/ultima/nuvie/gui/gui.cpp
index 57bc9ba80e7..f8c38741968 100644
--- a/engines/ultima/nuvie/gui/gui.cpp
+++ b/engines/ultima/nuvie/gui/gui.cpp
@@ -403,7 +403,7 @@ void GUI::lock_input(GUI_Widget *widget) {
}
Common::Path GUI::get_data_dir() const {
- Std::string datadir;
+ Common::String datadir;
config->value("config/datadir", datadir, "");
diff --git a/engines/ultima/nuvie/gui/gui_console.cpp b/engines/ultima/nuvie/gui/gui_console.cpp
index 819ee0300d8..63e63ad1fc5 100644
--- a/engines/ultima/nuvie/gui/gui_console.cpp
+++ b/engines/ultima/nuvie/gui/gui_console.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/misc/u6_misc.h"
#include "ultima/nuvie/gui/gui.h"
@@ -54,7 +54,7 @@ void GUI_Console:: Display(bool full_redraw) {
SDL_FillRect(surface, &area, bg_color->sdl_color);
uint16 i = 0;
- for (const Std::string &s : data) {
+ for (const Common::String &s : data) {
font->textOut(surface, area.left, area.top + i * font->charHeight(), s.c_str(), false);
i++;
}
@@ -63,16 +63,16 @@ void GUI_Console:: Display(bool full_redraw) {
return;
}
-void GUI_Console::AddLine(const Std::string &line) {
+void GUI_Console::AddLine(const Common::String &line) {
uint16 len = line.size();
uint16 i;
if (len > num_cols) {
for (i = 0; i + num_cols < len; i += num_cols)
- data.push_back(Std::string(line.substr(i, num_cols)));
+ data.push_back(Common::String(line.substr(i, num_cols)));
if (i < len)
- data.push_back(Std::string(line.substr(i, len - i)));
+ data.push_back(Common::String(line.substr(i, len - i)));
} else
data.push_back(line);
diff --git a/engines/ultima/nuvie/gui/gui_console.h b/engines/ultima/nuvie/gui/gui_console.h
index 24621cc8dab..b4e4af22366 100644
--- a/engines/ultima/nuvie/gui/gui_console.h
+++ b/engines/ultima/nuvie/gui/gui_console.h
@@ -38,7 +38,7 @@ class GUI_Console : public GUI_Widget {
GUI_Font *font;
uint16 num_cols;
uint16 num_rows;
- Std::list<Std::string> data;
+ Std::list<Common::String> data;
public:
GUI_Console(uint16 x, uint16 y, uint16 w, uint16 h);
@@ -55,7 +55,7 @@ public:
GUI_status MouseUp(int x, int y, Events::MouseButton button) override;
GUI_status MouseMotion(int x, int y, uint8 state) override;
- virtual void AddLine(const Std::string &line);
+ virtual void AddLine(const Common::String &line);
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/gui_dialog.cpp b/engines/ultima/nuvie/gui/gui_dialog.cpp
index 34cf0b40b83..502a56babd3 100644
--- a/engines/ultima/nuvie/gui/gui_dialog.cpp
+++ b/engines/ultima/nuvie/gui/gui_dialog.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/misc/u6_misc.h"
#include "ultima/nuvie/gui/gui.h"
diff --git a/engines/ultima/nuvie/gui/gui_scroll_bar.cpp b/engines/ultima/nuvie/gui/gui_scroll_bar.cpp
index c14640df2f0..8d18a071d5a 100644
--- a/engines/ultima/nuvie/gui/gui_scroll_bar.cpp
+++ b/engines/ultima/nuvie/gui/gui_scroll_bar.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/misc/u6_misc.h"
#include "ultima/nuvie/gui/gui.h"
diff --git a/engines/ultima/nuvie/gui/gui_scroller.cpp b/engines/ultima/nuvie/gui/gui_scroller.cpp
index eafc7864b96..b111c2d67f4 100644
--- a/engines/ultima/nuvie/gui/gui_scroller.cpp
+++ b/engines/ultima/nuvie/gui/gui_scroller.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/misc/u6_misc.h"
#include "ultima/nuvie/gui/gui.h"
diff --git a/engines/ultima/nuvie/gui/widgets/background.cpp b/engines/ultima/nuvie/gui/widgets/background.cpp
index ac7cf278d94..7f42ea0e4ea 100644
--- a/engines/ultima/nuvie/gui/widgets/background.cpp
+++ b/engines/ultima/nuvie/gui/widgets/background.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/misc/u6_misc.h"
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar.cpp b/engines/ultima/nuvie/gui/widgets/command_bar.cpp
index f18545f1cd6..f11a79113c5 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar.cpp
+++ b/engines/ultima/nuvie/gui/widgets/command_bar.cpp
@@ -44,8 +44,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::string;
-
static const Tile placeholder_tile = {
0,
false,
@@ -103,7 +101,7 @@ CommandBar::CommandBar(Game *g) : GUI_Widget(nullptr), game(g),
if (!game->is_orig_style()) {
cfg = game->get_config();
- Std::string pos_str;
+ Common::String pos_str;
cfg->value(config_get_game_key(cfg) + "/cb_position", pos_str, "default");
if (pos_str == "default")
right_pos_cb = !game->is_new_style();
@@ -459,7 +457,7 @@ void CommandBar::Display(bool full_redraw) {
}
void CommandBar::display_information() {
- string infostring(game->get_clock()->get_date_string());
+ Common::String infostring(game->get_clock()->get_date_string());
infostring += " Wind:";
infostring += wind;
font->drawString(screen, infostring.c_str(), area.left + 8, area.top, font_color, font_color);
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar.h b/engines/ultima/nuvie/gui/widgets/command_bar.h
index 55004598ba0..17bee96685d 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar.h
+++ b/engines/ultima/nuvie/gui/widgets/command_bar.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_COMMAND_BAR_H
#define NUVIE_CORE_COMMAND_BAR_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/gui/widgets/gui_widget.h"
#include "ultima/nuvie/misc/call_back.h"
@@ -60,7 +60,7 @@ protected:
sint8 selected_action; // underlined icon (-1 = none)
sint8 active_action_num; // the last action that was activated (for MD levers)
bool combat_mode; // state of combat icon
- Std::string wind; // wind direction
+ Common::String wind; // wind direction
void fill_square(uint8 pal_index);
uint8 bg_color, font_color;
@@ -83,7 +83,7 @@ public:
void select_action(sint8 activate);
void set_combat_mode(bool mode);
-// void set_wind(Std::string dir) { wind = dir; update_display = true; }
+// void set_wind(Common::String dir) { wind = dir; update_display = true; }
void set_selected_action(sint8 action) {
selected_action = action;
update_display = true;
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.cpp b/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.cpp
index 3c8117bbb03..a4a72d545b1 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.cpp
+++ b/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.cpp
@@ -44,8 +44,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::string;
-
#define btn_size 17
#define SELECTED_COLOR 248
#define table_size_U6 13
@@ -236,7 +234,7 @@ void CommandBarNewUI::Display(bool full_redraw) {
//scr->fill(bg_color, area.left, area.top, area.width(), area.height());
if (!game->is_orig_style()) {
//display_information();
- string infostring(game->get_clock()->get_date_string());
+ Common::String infostring(game->get_clock()->get_date_string());
infostring += " Wind:";
infostring += wind;
font->drawString(scr, infostring.c_str(), area.left - 13, area.top); // sort of center
@@ -273,7 +271,7 @@ const char *CommandBarNewUI::get_command_name(sint8 command_num) const {
/*
void CommandBarNewUI::display_information()
{
- string infostring(game->get_clock()->get_date_string());
+ Common::String infostring(game->get_clock()->get_date_string());
infostring += " Wind:";
infostring += wind;
text->drawString(screen, infostring.c_str(), area.left + 8, area.top, 0);
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h b/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
index 26ba7203ca2..4a3158936d5 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_CORE_COMMAND_BAR_NEW_UI_H
#define NUVIE_CORE_COMMAND_BAR_NEW_UI_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/gui/widgets/gui_widget.h"
#include "ultima/nuvie/misc/call_back.h"
#include "ultima/nuvie/gui/widgets/command_bar.h"
diff --git a/engines/ultima/nuvie/gui/widgets/console.cpp b/engines/ultima/nuvie/gui/widgets/console.cpp
index 40647caba39..66ccb0d31f2 100644
--- a/engines/ultima/nuvie/gui/widgets/console.cpp
+++ b/engines/ultima/nuvie/gui/widgets/console.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/misc/u6_misc.h"
#include "ultima/nuvie/gui/gui.h"
@@ -44,7 +44,7 @@ Console::~Console() {
}
-void Console::AddLine(const Std::string &line) {
+void Console::AddLine(const Common::String &line) {
GUI_Console::AddLine(line);
if (status == WIDGET_VISIBLE) {
@@ -83,7 +83,7 @@ void ConsoleAddInfo(const char *format, ...) {
}
}
-void ConsoleAddError(const Std::string &s) {
+void ConsoleAddError(const Common::String &s) {
if (g_console != nullptr) {
DEBUG(0, LEVEL_ERROR, "%s\n", s.c_str());
g_console->Show();
@@ -91,7 +91,7 @@ void ConsoleAddError(const Std::string &s) {
}
}
-void ConsoleAddWarning(const Std::string &s) {
+void ConsoleAddWarning(const Common::String &s) {
if (g_console != nullptr) {
DEBUG(0, LEVEL_WARNING, "%s\n", s.c_str());
g_console->AddLine("Warning: " + s);
diff --git a/engines/ultima/nuvie/gui/widgets/console.h b/engines/ultima/nuvie/gui/widgets/console.h
index f49e5002104..04767da6fcf 100644
--- a/engines/ultima/nuvie/gui/widgets/console.h
+++ b/engines/ultima/nuvie/gui/widgets/console.h
@@ -42,14 +42,14 @@ public:
Console(const Configuration *c, Screen *s, GUI *g, uint16 x, uint16 y, uint16 w, uint16 h);
~Console() override;
- void AddLine(const Std::string &line) override;
+ void AddLine(const Common::String &line) override;
};
void ConsoleInit(const Configuration *c, Screen *s, GUI *gui, uint16 w, uint16 h);
void ConsoleDelete();
void ConsoleAddInfo(const char *s, ...);
-void ConsoleAddError(const Std::string &s);
-void ConsoleAddWarning(const Std::string &s);
+void ConsoleAddError(const Common::String &s);
+void ConsoleAddWarning(const Common::String &s);
void ConsolePause();
void ConsoleShow();
void ConsoleHide();
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.cpp b/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
index bf9ca383c84..09cbe2f99cd 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/misc/u6_misc.h"
@@ -56,7 +56,7 @@ ConverseGump::ConverseGump(const Configuration *cfg, Font *f, Screen *s) {
// y = 8;
int gump_h;
uint8 min_h, default_c;
- Std::string height_str;
+ Common::String height_str;
min_w = game->get_min_converse_gump_width();
uint16 x_off = game->get_game_x_offset();
uint16 y_off = game->get_game_y_offset();
@@ -328,15 +328,15 @@ void ConverseGump::add_token(MsgText *token)
}
*/
-void ConverseGump::display_string(const Std::string &s, Font *f, bool include_on_map_window) {
+void ConverseGump::display_string(const Common::String &s, Font *f, bool include_on_map_window) {
if (s.empty())
return;
MsgScroll::display_string(strip_whitespace_after_break(s), f, include_on_map_window);//, MSGSCROLL_NO_MAP_DISPLAY);
}
-Std::string ConverseGump::strip_whitespace_after_break(Std::string s) {
- Std::string::iterator iter;
+Common::String ConverseGump::strip_whitespace_after_break(Common::String s) {
+ Common::String::iterator iter;
for (iter = s.begin(); iter != s.end();) {
if (found_break_char == true) {
char c = *iter;
@@ -363,7 +363,7 @@ bool ConverseGump::parse_token(MsgText *token) {
int i = 0;
int len = (int)token->s.size();
while (at_idx != -1 && i < len) {
- Std::string keyword = "";
+ Common::String keyword = "";
for (i = at_idx + 1; i < len; i++) {
char c = token->s[i];
if (Common::isAlpha(c)) {
@@ -408,7 +408,7 @@ void ConverseGump::parse_fm_towns_token(MsgText *token) {
i++;
}
- Std::string keyword = "";
+ Common::String keyword = "";
for (; i < len; i++) {
char ch = token->s[i];
@@ -433,8 +433,8 @@ void ConverseGump::parse_fm_towns_token(MsgText *token) {
return;
}
-void ConverseGump::add_keyword(const Std::string keyword_) {
- string keyword = " *" + keyword_;
+void ConverseGump::add_keyword(const Common::String keyword_) {
+ Common::String keyword = " *" + keyword_;
for (const MsgText &txt : *keyword_list) {
if (string_i_compare(txt.s, keyword)) {
@@ -448,7 +448,7 @@ void ConverseGump::add_keyword(const Std::string keyword_) {
keyword_list->push_back(m_text);
}
-Std::string ConverseGump::get_token_string_at_pos(uint16 x, uint16 y) {
+Common::String ConverseGump::get_token_string_at_pos(uint16 x, uint16 y) {
uint16 total_length = 0;
uint16 tmp_y = area.top + portrait_height + 8 + 3 + 4;
Std::list<MsgText>::iterator iter;
@@ -474,16 +474,16 @@ Std::string ConverseGump::get_token_string_at_pos(uint16 x, uint16 y) {
return "";
}
-Std::string ConverseGump::get_token_at_cursor() {
+Common::String ConverseGump::get_token_at_cursor() {
uint16 i = 0;
Std::list<MsgText>::iterator iter;
for (iter = keyword_list->begin(); iter != keyword_list->end(); i++, iter++) {
if (i == cursor_position) {
- Std::string keyword = (*iter).s;
+ Common::String keyword = (*iter).s;
if (!is_permanent_keyword(keyword)) {
keyword_list->erase(iter);
if (permit_input)
- keyword = Std::string(keyword.at(2)); // only return first char after " *"
+ keyword = Common::String(keyword.at(2)); // only return first char after " *"
}
return keyword;
}
@@ -695,7 +695,7 @@ GUI_status ConverseGump::KeyDown(const Common::KeyState &keyState) {
}
GUI_status ConverseGump::MouseUp(int x, int y, Events::MouseButton button) {
- Std::string token_str;
+ Common::String token_str;
if (page_break || !is_talking()) { // any click == scroll-to-end
page_break = false;
@@ -730,7 +730,7 @@ GUI_status ConverseGump::MouseUp(int x, int y, Events::MouseButton button) {
return GUI_YUM;
}
-void ConverseGump::input_add_string(Std::string token_str) {
+void ConverseGump::input_add_string(Common::String token_str) {
input_buf.clear();
for (uint16 i = 0; i < token_str.size(); i++) {
if (Common::isAlnum(token_str[i]) && (!permit_input || strchr(permit_input, token_str[i])
@@ -739,7 +739,7 @@ void ConverseGump::input_add_string(Std::string token_str) {
}
}
-bool ConverseGump::is_permanent_keyword(const Std::string &keyword) {
+bool ConverseGump::is_permanent_keyword(const Common::String &keyword) {
return (string_i_compare(keyword, " *buy") || string_i_compare(keyword, " *sell")
|| string_i_compare(keyword, " *bye") || string_i_compare(keyword, " *spells")
|| string_i_compare(keyword, " *reagents"));
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.h b/engines/ultima/nuvie/gui/widgets/converse_gump.h
index 04176017cf5..8d83003bd15 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.h
@@ -25,7 +25,7 @@
#include "ultima/nuvie/misc/call_back.h"
#include "ultima/nuvie/gui/widgets/gui_widget.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
@@ -70,8 +70,8 @@ public:
void set_actor_portrait(Actor *a);
unsigned char *create_framed_portrait(Actor *a);
bool parse_token(MsgText *token) override;
- Std::string get_token_string_at_pos(uint16 x, uint16 y) override;
- void display_string(const Std::string &s, Font *f, bool include_on_map_window) override;
+ Common::String get_token_string_at_pos(uint16 x, uint16 y) override;
+ void display_string(const Common::String &s, Font *f, bool include_on_map_window) override;
void set_talking(bool state, Actor *actor = nullptr) override;
void set_font(uint8 font_type) override {}
//bool get_solid_bg() { return solid_bg; }
@@ -123,8 +123,8 @@ public:
void drawCursor(uint16 x, uint16 y) override;
protected:
- Std::string strip_whitespace_after_break(Std::string s);
- void add_keyword(Std::string keyword);
+ Common::String strip_whitespace_after_break(Common::String s);
+ void add_keyword(Common::String keyword);
void set_permitted_input(const char *allowed) override;
void clear_permitted_input() override;
@@ -139,11 +139,11 @@ protected:
cursor_position = keyword_list ? keyword_list->size() : 0;
}
- void input_add_string(Std::string token_str);
+ void input_add_string(Common::String token_str);
- Std::string get_token_at_cursor();
+ Common::String get_token_at_cursor();
- bool is_permanent_keyword(const Std::string &keyword);
+ bool is_permanent_keyword(const Common::String &keyword);
void parse_fm_towns_token(MsgText *token);
private:
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.cpp b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.cpp
index 6187f45de8a..61272eff240 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.cpp
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/misc/u6_misc.h"
@@ -61,7 +61,7 @@ ConverseGumpWOU::ConverseGumpWOU(const Configuration *cfg, Font *f, Screen *s)
set_scroll_dimensions(18, 18);
- Std::string height_str;
+ Common::String height_str;
uint16 x_off = game->get_game_x_offset();
uint16 y_off = game->get_game_y_offset();
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
index 27d0eac746f..ad0bbd559e5 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
@@ -26,7 +26,7 @@
#include "ultima/nuvie/gui/widgets/gui_widget.h"
#include "ultima/nuvie/fonts/font.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
@@ -94,7 +94,7 @@ public:
protected:
- void input_add_string(Std::string token_str);
+ void input_add_string(Common::String token_str);
void process_page_break() override;
uint8 get_input_font_color() const override {
return FONT_COLOR_WOU_CONVERSE_INPUT;
diff --git a/engines/ultima/nuvie/gui/widgets/fps_counter.cpp b/engines/ultima/nuvie/gui/widgets/fps_counter.cpp
index 62e1edf0e2f..8e3515e7878 100644
--- a/engines/ultima/nuvie/gui/widgets/fps_counter.cpp
+++ b/engines/ultima/nuvie/gui/widgets/fps_counter.cpp
@@ -31,8 +31,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::string;
-
FpsCounter::FpsCounter(Game *g) : GUI_Widget(nullptr) {
game = g;
font = game->get_font_manager()->get_conv_font();
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.cpp b/engines/ultima/nuvie/gui/widgets/map_window.cpp
index e6007e98bb8..8a40de4802d 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.cpp
+++ b/engines/ultima/nuvie/gui/widgets/map_window.cpp
@@ -1725,7 +1725,7 @@ CanDropOrMoveMsg MapWindow::can_drop_or_move_obj(uint16 x, uint16 y, Actor *acto
return MSG_NOT_POSSIBLE;
}
-void MapWindow::display_can_drop_or_move_msg(CanDropOrMoveMsg msg, string msg_text) {
+void MapWindow::display_can_drop_or_move_msg(CanDropOrMoveMsg msg, Common::String msg_text) {
if (msg == MSG_NOT_POSSIBLE)
msg_text += "Not possible\n";
else if (msg == MSG_BLOCKED)
@@ -1945,7 +1945,7 @@ bool MapWindow::move_on_drop(Obj *obj) {
}
void MapWindow::set_interface() {
- Std::string interface_str;
+ Common::String interface_str;
config->value("config/input/interface", interface_str, "normal");
if (interface_str == "ignore_block" || Game::get_game()->using_hackmove()) // game variable is not initialized
interface = INTERFACE_IGNORE_BLOCK;
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.h b/engines/ultima/nuvie/gui/widgets/map_window.h
index 9b087eb0cc0..b88a529772f 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.h
+++ b/engines/ultima/nuvie/gui/widgets/map_window.h
@@ -282,7 +282,7 @@ public:
bool in_town() const;
// can put object at world location x,y?
CanDropOrMoveMsg can_drop_or_move_obj(uint16 x, uint16 y, Actor *actor, Obj *obj);
- void display_can_drop_or_move_msg(CanDropOrMoveMsg msg, Std::string msg_text = "");
+ void display_can_drop_or_move_msg(CanDropOrMoveMsg msg, Common::String msg_text = "");
bool can_get_obj(const Actor *actor, Obj *obj);
bool blocked_by_wall(const Actor *actor, const Obj *obj);
MapCoord original_obj_loc;
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
index 1c3fadd625f..fa27f908091 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/misc/u6_misc.h"
@@ -40,7 +40,7 @@ namespace Nuvie {
MsgText::MsgText() : font(nullptr), color(0) {
}
-MsgText::MsgText(const Std::string &new_string, Font *f) : font(f), color(0) {
+MsgText::MsgText(const Common::String &new_string, Font *f) : font(f), color(0) {
s.assign(new_string);
if (font) {
color = font->getDefaultColor();
@@ -50,7 +50,7 @@ MsgText::MsgText(const Std::string &new_string, Font *f) : font(f), color(0) {
MsgText::~MsgText() {
}
-void MsgText::append(const Std::string &new_string) {
+void MsgText::append(const Common::String &new_string) {
s.append(new_string);
}
@@ -244,7 +244,7 @@ MsgScroll::~MsgScroll() {
}
bool MsgScroll::init(const char *player_name) {
- Std::string prompt_string;
+ Common::String prompt_string;
prompt_string.append(player_name);
if (game_type == NUVIE_GAME_U6) {
@@ -275,7 +275,7 @@ void MsgScroll::set_scroll_dimensions(uint16 w, uint16 h) {
display_pos = 0;
}
-int MsgScroll::print_internal(const Std::string *format, ...) {
+int MsgScroll::print_internal(const Common::String *format, ...) {
va_list ap;
int printed = 0;
@@ -337,23 +337,23 @@ void MsgScroll::display_fmt_string(const char *format, ...) {
display_string(buf);
}
-void MsgScroll::display_string(const Std::string &s, uint16 length, uint8 lang_num) {
+void MsgScroll::display_string(const Common::String &s, uint16 length, uint8 lang_num) {
}
-void MsgScroll::display_string(const Std::string &s, bool include_on_map_window) {
+void MsgScroll::display_string(const Common::String &s, bool include_on_map_window) {
display_string(s, font, include_on_map_window);
}
-void MsgScroll::display_string(const Std::string &s, uint8 color, bool include_on_map_window) {
+void MsgScroll::display_string(const Common::String &s, uint8 color, bool include_on_map_window) {
display_string(s, font, color, include_on_map_window);
}
-void MsgScroll::display_string(const Std::string &s, Font *f, bool include_on_map_window) {
+void MsgScroll::display_string(const Common::String &s, Font *f, bool include_on_map_window) {
display_string(s, f, font_color, include_on_map_window);
}
-void MsgScroll::display_string(const Std::string &s, Font *f, uint8 color, bool include_on_map_window) {
+void MsgScroll::display_string(const Common::String &s, Font *f, uint8 color, bool include_on_map_window) {
MsgText *msg_text;
if (s.empty())
@@ -648,7 +648,7 @@ void MsgScroll::set_input_mode(bool state, const char *allowed, bool can_escape,
char *user_data = callback_user_data;
cancel_input_request(); // clear originals (callback may request again)
- Std::string input_str = input_buf;
+ Common::String input_str = input_buf;
requestor->set_user_data(user_data); // use temp requestor/user_data
requestor->callback(MSGSCROLL_CB_TEXT_READY, this, &input_str);
}
@@ -859,7 +859,7 @@ GUI_status MsgScroll::MouseWheel(sint32 x, sint32 y) {
GUI_status MsgScroll::MouseUp(int x, int y, Events::MouseButton button) {
uint16 i;
- Std::string token_str;
+ Common::String token_str;
if (page_break) { // any click == scroll-to-end
process_page_break();
@@ -897,7 +897,7 @@ GUI_status MsgScroll::MouseUp(int x, int y, Events::MouseButton button) {
return GUI_PASS;
}
-Std::string MsgScroll::get_token_string_at_pos(uint16 x, uint16 y) {
+Common::String MsgScroll::get_token_string_at_pos(uint16 x, uint16 y) {
uint16 i;
sint32 buf_x, buf_y;
MsgText *token = nullptr;
@@ -1060,9 +1060,9 @@ bool MsgScroll::has_input() {
return false;
}
-Std::string MsgScroll::get_input() {
+Common::String MsgScroll::get_input() {
// MsgScroll sets input_mode to false when it receives Common::KEYCODE_ENTER
- Std::string s;
+ Common::String s;
if (input_mode == false) {
s.assign(input_buf);
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.h b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
index 084928ce6eb..7a5be591b5c 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
@@ -55,14 +55,14 @@ class MsgText {
public:
Font *font;
- Std::string s;
+ Common::String s;
uint8 color;
MsgText();
- MsgText(const Std::string &new_string, Font *f);
+ MsgText(const Common::String &new_string, Font *f);
~MsgText();
- void append(const Std::string &new_string);
+ void append(const Common::String &new_string);
void copy(MsgText *msg_text);
uint32 length();
@@ -115,7 +115,7 @@ protected:
virtual void process_page_break();
Std::list<MsgLine *> msg_buf;
- Std::string input_buf;
+ Common::String input_buf;
bool permit_inputescape; // can RETURN or ESCAPE be used to escape input entry
uint16 cursor_wait;
@@ -198,13 +198,13 @@ public:
virtual bool is_garg_font();
template<class... TParam>
- int print(const Std::string &format, TParam... param);
+ int print(const Common::String &format, TParam... param);
- virtual void display_string(const Std::string &s, Font *f, bool include_on_map_window);
- void display_string(const Std::string &s, Font *f, uint8 color, bool include_on_map_window);
- void display_string(const Std::string &s, uint16 length, uint8 lang_num);
- void display_string(const Std::string &s, bool include_on_map_window = true);
- void display_string(const Std::string &s, uint8 color, bool include_on_map_window);
+ virtual void display_string(const Common::String &s, Font *f, bool include_on_map_window);
+ void display_string(const Common::String &s, Font *f, uint8 color, bool include_on_map_window);
+ void display_string(const Common::String &s, uint16 length, uint8 lang_num);
+ void display_string(const Common::String &s, bool include_on_map_window = true);
+ void display_string(const Common::String &s, uint8 color, bool include_on_map_window);
void display_fmt_string(const char *format, ...);
void message(const char *string) {
display_string(string);
@@ -245,7 +245,7 @@ public:
GUI_status KeyDown(const Common::KeyState &key) override;
GUI_status MouseUp(int x, int y, Events::MouseButton button) override;
GUI_status MouseWheel(sint32 x, sint32 y) override;
- virtual Std::string get_token_string_at_pos(uint16 x, uint16 y);
+ virtual Common::String get_token_string_at_pos(uint16 x, uint16 y);
//void updateScroll();
void Display(bool full_redraw) override;
@@ -263,7 +263,7 @@ public:
}
bool has_input();
- Std::string get_input();
+ Common::String get_input();
const char *peek_at_input();
void request_input(CallBack *caller, void *user_data);
void cancel_input_request() {
@@ -290,11 +290,11 @@ protected:
}
private:
- int print_internal(const Std::string *format, ...);
+ int print_internal(const Common::String *format, ...);
};
template<class... TParam>
-inline int MsgScroll::print(const Std::string &format, TParam... param) {
+inline int MsgScroll::print(const Common::String &format, TParam... param) {
return print_internal(&format, Common::forward<TParam>(param)...);
}
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
index 78915050256..6964be1916b 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/misc/u6_misc.h"
@@ -48,7 +48,7 @@ MsgScrollNewUI::MsgScrollNewUI(const Configuration *cfg, Screen *s) {
init(cfg, font_normal);
- Std::string new_scroll_cfg = config_get_game_key(config) + "/newscroll";
+ Common::String new_scroll_cfg = config_get_game_key(config) + "/newscroll";
cfg->value(new_scroll_cfg + "/solid_bg", solid_bg, false);
@@ -99,11 +99,11 @@ bool MsgScrollNewUI::can_fit_token_on_msgline(MsgLine *msg_line, MsgText *token)
return true;
}
-void MsgScrollNewUI::display_string(const Std::string &str, Font *f, bool include_on_map_window) {
+void MsgScrollNewUI::display_string(const Common::String &str, Font *f, bool include_on_map_window) {
if (str.empty())
return;
bool has_trailing_whitespace = (!trailing_whitespace.empty());
- string s = trailing_whitespace + str;
+ Common::String s = trailing_whitespace + str;
trailing_whitespace.clear();
uint16 i, pos;
@@ -132,7 +132,7 @@ void MsgScrollNewUI::display_string(const Std::string &str, Font *f, bool includ
}
}
-uint16 MsgScrollNewUI::count_empty_lines(const Std::string &s) {
+uint16 MsgScrollNewUI::count_empty_lines(const Common::String &s) {
uint16 count = 0;
for (char c : s) {
if (c != ' ' && c != '\t' && c != '\n')
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
index e05ee9a69b9..336332989b7 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
@@ -25,7 +25,7 @@
#include "ultima/nuvie/misc/call_back.h"
#include "ultima/nuvie/gui/widgets/gui_widget.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
@@ -56,7 +56,7 @@ class MsgScrollNewUI: public MsgScroll {
uint8 border_color;
uint16 position;
- Std::string trailing_whitespace;
+ Common::String trailing_whitespace;
public:
@@ -77,7 +77,7 @@ public:
void display_prompt() override {}
- void display_string(const Std::string &s, Font *f, bool include_on_map_window) override;
+ void display_string(const Common::String &s, Font *f, bool include_on_map_window) override;
void set_font(uint8 font_type) override;
bool is_garg_font() override;
@@ -99,7 +99,7 @@ protected:
private:
GUI_status scroll_movement_event(MsgScrollEventType event);
- uint16 count_empty_lines(const Std::string &s);
+ uint16 count_empty_lines(const Common::String &s);
};
diff --git a/engines/ultima/nuvie/keybinding/keys.cpp b/engines/ultima/nuvie/keybinding/keys.cpp
index 97c2b2ceda9..5fb587a7157 100644
--- a/engines/ultima/nuvie/keybinding/keys.cpp
+++ b/engines/ultima/nuvie/keybinding/keys.cpp
@@ -292,7 +292,7 @@ const Action doNothingAction = { "DO_NOTHING", ActionDoNothing, Action::KeyNotSh
KeyBinder::KeyBinder(const Configuration *config) : enable_joystick(false) {
FillParseMaps();
- Std::string keyfilename, dir;
+ Common::String keyfilename, dir;
config->value("config/keys", keyfilename, "(default)");
bool key_file_exists = fileExists(keyfilename.c_str());
@@ -535,9 +535,9 @@ void KeyBinder::ParseText(char *text, int len) {
}
}
-static void skipspace(string &s) {
+static void skipspace(Common::String &s) {
size_t i = s.findFirstNotOf(whitespace);
- if (i && i != string::npos)
+ if (i && i != Common::String::npos)
s.erase(0, i);
}
@@ -545,8 +545,8 @@ static void skipspace(string &s) {
void KeyBinder::ParseLine(const char *line) {
size_t i;
Common::KeyState k(Common::KEYCODE_INVALID);
- string s = line;
- string keycode;
+ Common::String s = line;
+ Common::String keycode;
skipspace(s);
@@ -554,7 +554,7 @@ void KeyBinder::ParseLine(const char *line) {
if (s.empty() || s.hasPrefix("#"))
return;
- string u = s;
+ Common::String u = s;
u.toUppercase();
// get key
@@ -576,7 +576,7 @@ void KeyBinder::ParseLine(const char *line) {
i = s.findFirstOf(whitespace);
keycode = s.substr(0, i);
s.erase(0, i);
- string t = keycode;
+ Common::String t = keycode;
t.toUppercase();
if (t.empty()) {
@@ -612,7 +612,7 @@ void KeyBinder::ParseLine(const char *line) {
skipspace(s);
i = s.findFirstOf(whitespace);
- string t = s.substr(0, i);
+ Common::String t = s.substr(0, i);
s.erase(0, i);
t.toUppercase();
@@ -632,7 +632,7 @@ void KeyBinder::ParseLine(const char *line) {
a.param = -1;
if (!s.empty() && s[0] != '#') {
i = s.findFirstOf(whitespace);
- string tmp = s.substr(0, i);
+ Common::String tmp = s.substr(0, i);
s.erase(0, i);
skipspace(s);
@@ -670,8 +670,8 @@ void KeyBinder::LoadFromFile(const char *filename) {
}
void KeyBinder::LoadGameSpecificKeys() {
- string key_path_str;
- string default_key_path;
+ Common::String key_path_str;
+ Common::String default_key_path;
const Configuration *config = Game::get_game()->get_config();
config->value("config/datadir", default_key_path, "./data");
nuvie_game_t game_type = get_game_type(config);
@@ -697,7 +697,7 @@ void KeyBinder::LoadGameSpecificKeys() {
}
void KeyBinder::LoadFromPatch() { // FIXME default should probably be system specific
- string PATCH_KEYS;
+ Common::String PATCH_KEYS;
const Configuration *config = Game::get_game()->get_config();
config->value(config_get_game_key(config) + "/patch_keys", PATCH_KEYS, "./patchkeys.txt");
diff --git a/engines/ultima/nuvie/keybinding/keys.h b/engines/ultima/nuvie/keybinding/keys.h
index 2ff8675d58d..2e230bf3713 100644
--- a/engines/ultima/nuvie/keybinding/keys.h
+++ b/engines/ultima/nuvie/keybinding/keys.h
@@ -25,7 +25,7 @@
#include "ultima/nuvie/keybinding/keys_enum.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "common/events.h"
#include "common/hash-str.h"
diff --git a/engines/ultima/nuvie/menus/cheats_dialog.cpp b/engines/ultima/nuvie/menus/cheats_dialog.cpp
index 8fb0a146dd1..c6fa8f025a2 100644
--- a/engines/ultima/nuvie/menus/cheats_dialog.cpp
+++ b/engines/ultima/nuvie/menus/cheats_dialog.cpp
@@ -181,7 +181,7 @@ GUI_status CheatsDialog::callback(uint16 msg, GUI_CallBack *caller, void *data)
Game *game = Game::get_game();
Configuration *config = game->get_config();
- Std::string key = config_get_game_key(config);
+ Common::String key = config_get_game_key(config);
key.append("/show_eggs");
config->set(key, egg_button->GetSelection() ? "yes" : "no");
game->get_obj_manager()->set_show_eggs(egg_button->GetSelection());
diff --git a/engines/ultima/nuvie/menus/gameplay_dialog.cpp b/engines/ultima/nuvie/menus/gameplay_dialog.cpp
index 718b77c0f7c..8e2dd80cb92 100644
--- a/engines/ultima/nuvie/menus/gameplay_dialog.cpp
+++ b/engines/ultima/nuvie/menus/gameplay_dialog.cpp
@@ -53,7 +53,7 @@ GameplayDialog::GameplayDialog(GUI_CallBack *callback)
grab_focus();
}
-int get_selected_game_index(const Std::string configvalue) {
+int get_selected_game_index(const Common::String configvalue) {
if (string_i_compare(configvalue, "menuselect")) {
return 0;
} else if (string_i_compare(configvalue, "ultima6")) {
@@ -88,12 +88,12 @@ bool GameplayDialog::init() {
const char *const selected_game_text[] = {"Menu Select", "Ultima VI", "Savage Empire", "Martian Dreams"};
const char *const converse_style_text[] = {"Default", "U7 Style", "WOU Style"};
- Std::string selected_game;
+ Common::String selected_game;
config->value("config/loadgame", selected_game, "");
bool is_u6 = (game->get_game_type() == NUVIE_GAME_U6);
bool show_stealing, skip_intro, show_console, use_original_cursor, solid_bg;
- Std::string key = config_get_game_key(config);
+ Common::String key = config_get_game_key(config);
config->value(key + "/skip_intro", skip_intro, false);
config->value("config/general/show_console", show_console, false);
config->value("config/general/enable_cursors", use_original_cursor, false);
@@ -257,7 +257,7 @@ GUI_status GameplayDialog::callback(uint16 msg, GUI_CallBack *caller, void *data
} else if (caller == save_button) {
Game *game = Game::get_game();
Configuration *config = game->get_config();
- Std::string key = config_get_game_key(config);
+ Common::String key = config_get_game_key(config);
game->get_party()->set_formation(formation_button->GetSelection());
config->set("config/general/party_formation", formation_button->GetSelection() ? "yes" : "no");
diff --git a/engines/ultima/nuvie/menus/input_dialog.cpp b/engines/ultima/nuvie/menus/input_dialog.cpp
index 095e5d42f18..b91f71112cc 100644
--- a/engines/ultima/nuvie/menus/input_dialog.cpp
+++ b/engines/ultima/nuvie/menus/input_dialog.cpp
@@ -97,7 +97,7 @@ bool InputDialog::init() {
Configuration *config = game->get_config();
int interface;
- Std::string interface_str;
+ Common::String interface_str;
config->value("config/input/interface", interface_str, "normal"); // get cfg variable because hackmove changes InterfaceType
if (interface_str == "ignore_block")
interface = 2;
@@ -223,7 +223,7 @@ GUI_status InputDialog::callback(uint16 msg, GUI_CallBack *caller, void *data) {
MapWindow *map_window = game->get_map_window();
Configuration *config = Game::get_game()->get_config();
- Std::string interface_str;
+ Common::String interface_str;
if (interface_button->GetSelection() == 2)
interface_str = "ignore_block";
else if (interface_button->GetSelection() == 1)
diff --git a/engines/ultima/nuvie/menus/video_dialog.cpp b/engines/ultima/nuvie/menus/video_dialog.cpp
index 1a8c9408472..3d1c89db33d 100644
--- a/engines/ultima/nuvie/menus/video_dialog.cpp
+++ b/engines/ultima/nuvie/menus/video_dialog.cpp
@@ -133,7 +133,7 @@ bool VideoDialog::init() {
widget = new GUI_Text(colX[1], textY += row_h, 0, 0, 0, "Use custom actor tiles:", gui->get_font());
AddWidget(widget);
const char *const sprite_text[] = { "no", "yes", "default" };
- Std::string custom_tile_str;
+ Common::String custom_tile_str;
int custom_tiles;
config->value(config_get_game_key(config) + "/custom_actor_tiles", custom_tile_str, "default");
if (custom_tile_str == "default")
diff --git a/engines/ultima/nuvie/misc/call_back.h b/engines/ultima/nuvie/misc/call_back.h
index 0a6e3b90386..606074fa03d 100644
--- a/engines/ultima/nuvie/misc/call_back.h
+++ b/engines/ultima/nuvie/misc/call_back.h
@@ -40,7 +40,7 @@ typedef enum {
EFFECT_CB_COMPLETE, /* effect has finished */
CB_DATA_READY, /* some data is ready to be retrieved (data=char)*/
- MSGSCROLL_CB_TEXT_READY, /* text is ready to be retrieved (data=Std::string)*/
+ MSGSCROLL_CB_TEXT_READY, /* text is ready to be retrieved (data=Common::String)*/
CB_INPUT_CANCELED /* input canceled by user */
} CallbackMessage;
diff --git a/engines/ultima/nuvie/misc/u6_misc.cpp b/engines/ultima/nuvie/misc/u6_misc.cpp
index 9e98b7aa80c..9f06ce759ce 100644
--- a/engines/ultima/nuvie/misc/u6_misc.cpp
+++ b/engines/ultima/nuvie/misc/u6_misc.cpp
@@ -33,14 +33,14 @@ namespace Nuvie {
using namespace Std;
-void Tokenise(const Std::string &str, Std::vector<Std::string> &tokens, char delimiter = ' ') {
- Std::string delimiters(delimiter);
+void Tokenise(const Common::String &str, Std::vector<Common::String> &tokens, char delimiter = ' ') {
+ Common::String delimiters(delimiter);
// Skip delimiters at beginning.
- string::size_type lastPos = str.findFirstNotOf(delimiters, 0);
+ Common::String::size_type lastPos = str.findFirstNotOf(delimiters, 0);
- for (string::size_type pos = str.findFirstOf(delimiters, lastPos) ;
- string::npos != pos || string::npos != lastPos ;
+ for (Common::String::size_type pos = str.findFirstOf(delimiters, lastPos) ;
+ Common::String::npos != pos || Common::String::npos != lastPos ;
pos = str.findFirstOf(delimiters, lastPos)) {
// Found a token, add it to the vector.
tokens.push_back(str.substr(lastPos, pos - lastPos));
@@ -49,8 +49,8 @@ void Tokenise(const Std::string &str, Std::vector<Std::string> &tokens, char del
}
}
-Std::string config_get_game_key(const Configuration *config) {
- Std::string game_key, game_name;
+Common::String config_get_game_key(const Configuration *config) {
+ Common::String game_key, game_name;
config->value("config/GameName", game_name);
@@ -73,8 +73,8 @@ const char *get_game_tag(int game_type) {
return "";
}
-void config_get_path(const Configuration *config, const Std::string &filename, Common::Path &path) {
- Std::string key, game_name;
+void config_get_path(const Configuration *config, const Common::String &filename, Common::Path &path) {
+ Common::String key, game_name;
Common::Path game_dir, tmp_path;
config->value("config/GameName", game_name);
@@ -92,8 +92,8 @@ void config_get_path(const Configuration *config, const Std::string &filename, C
int mkdir_recursive(const Common::Path &path, int mode) {
#ifdef TODO
- vector<string> directories;
- string tmp_path;
+ vector<Common::String> directories;
+ Common::String tmp_path;
Tokenise(path, directories, U6PATH_DELIMITER);
@@ -143,12 +143,12 @@ nuvie_game_t get_game_type(const Configuration *config) {
return (nuvie_game_t)game_type;
}
-void build_path(const Common::Path &path, const Std::string &filename, Common::Path &full_path) {
+void build_path(const Common::Path &path, const Common::String &filename, Common::Path &full_path) {
full_path = path.appendComponent(filename);
}
bool has_fmtowns_support(const Configuration *config) {
- Std::string townsdir;
+ Common::String townsdir;
config->value("config/townsdir", townsdir, "");
if (townsdir != "" && directory_exists(townsdir.c_str()))
return true;
@@ -207,7 +207,7 @@ void print_bool(DebugLevelType level, bool state, const char *yes, const char *n
void print_flags(DebugLevelType level, uint8 num, const char *f[8]) {
- Std::string complete_flags = "";
+ Common::String complete_flags = "";
print_b(level, num);
if (num != 0)
complete_flags += "(";
@@ -583,7 +583,7 @@ void draw_line_8bit(int sx, int sy, int ex, int ey, uint8 col, uint8 *pixels, ui
}
-bool string_i_compare(const Std::string &s1, const Std::string &s2) {
+bool string_i_compare(const Common::String &s1, const Common::String &s2) {
return scumm_stricmp(s1.c_str(), s2.c_str()) == 0;
}
@@ -695,8 +695,8 @@ sint8 get_wrapped_rel_dir(sint16 p1, sint16 p2, uint8 level) {
return ret;
}
-Std::string encode_xml_entity(const Std::string &s) {
- string ret;
+Common::String encode_xml_entity(const Common::String &s) {
+ Common::String ret;
for (const auto &c : s) {
switch (c) {
diff --git a/engines/ultima/nuvie/misc/u6_misc.h b/engines/ultima/nuvie/misc/u6_misc.h
index 9d853df87c0..80036f87f23 100644
--- a/engines/ultima/nuvie/misc/u6_misc.h
+++ b/engines/ultima/nuvie/misc/u6_misc.h
@@ -30,7 +30,7 @@
* Copyright (c) 2003. All rights reserved.
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "common/rect.h"
#include "graphics/managed_surface.h"
@@ -46,12 +46,12 @@ typedef enum {
FORCE_MOVE
} MovementStatus;
-Std::string config_get_game_key(const Configuration *config);
+Common::String config_get_game_key(const Configuration *config);
const char *get_game_tag(int game_type);
-void config_get_path(const Configuration *config, const Std::string &filename, Common::Path &path);
+void config_get_path(const Configuration *config, const Common::String &filename, Common::Path &path);
uint8 get_game_type(const char *string);
nuvie_game_t get_game_type(const Configuration *config);
-void build_path(const Common::Path &path, const Std::string &filename, Common::Path &full_path);
+void build_path(const Common::Path &path, const Common::String &filename, Common::Path &full_path);
bool directory_exists(const Common::Path &directory);
bool file_exists(const Common::Path &path);
void print_b(DebugLevelType level, uint8 num);
@@ -94,7 +94,7 @@ int mkdir_recursive(const Common::Path &path, int mode);
void draw_line_8bit(int sx, int sy, int ex, int ey, uint8 col, uint8 *pixels, uint16 w, uint16 h);
-bool string_i_compare(const Std::string &s1, const Std::string &s2);
+bool string_i_compare(const Common::String &s1, const Common::String &s2);
void *nuvie_realloc(void *ptr, size_t size);
@@ -109,7 +109,7 @@ bool has_fmtowns_support(const Configuration *config);
uint16 wrap_signed_coord(sint16 coord, uint8 level);
sint8 get_wrapped_rel_dir(sint16 p1, sint16 p2, uint8 level);
-Std::string encode_xml_entity(const Std::string &s);
+Common::String encode_xml_entity(const Common::String &s);
} // End of namespace Nuvie
} // End of namespace Ultima
diff --git a/engines/ultima/nuvie/nuvie.cpp b/engines/ultima/nuvie/nuvie.cpp
index 170f6e02cdd..1796551b28c 100644
--- a/engines/ultima/nuvie/nuvie.cpp
+++ b/engines/ultima/nuvie/nuvie.cpp
@@ -213,7 +213,7 @@ void NuvieEngine::initConfig() {
}
void NuvieEngine::assignGameConfigValues(uint8 gameType) {
- Std::string game_name, game_id;
+ Common::String game_name, game_id;
_config->set("config/GameType", gameType);
@@ -248,7 +248,7 @@ bool NuvieEngine::checkGameDir(uint8 gameType) {
}
bool NuvieEngine::checkDataDir() {
- Std::string path;
+ Common::String path;
_config->value("config/datadir", path, "");
ConsoleAddInfo("datadir: \"%s\"", path.c_str());
@@ -393,7 +393,7 @@ bool NuvieEngine::quickSave(int saveSlot, bool isLoad) {
if (saveSlot < 0 || saveSlot > 99)
return false;
- Std::string text;
+ Common::String text;
MsgScroll *scroll = _game->get_scroll();
if (isLoad) {
@@ -408,7 +408,7 @@ bool NuvieEngine::quickSave(int saveSlot, bool isLoad) {
text = Common::convertFromU32String(_("saving quick save %d"));
}
- text = Std::string::format(text.c_str(), saveSlot);
+ text = Common::String::format(text.c_str(), saveSlot);
scroll->display_string(text);
if (isLoad) {
@@ -430,7 +430,7 @@ bool NuvieEngine::playIntro() {
return true;
bool skip_intro;
- string key = config_get_game_key(_config);
+ Common::String key = config_get_game_key(_config);
key.append("/skip_intro");
_config->value(key, skip_intro, false);
diff --git a/engines/ultima/nuvie/nuvie.h b/engines/ultima/nuvie/nuvie.h
index bb096175315..f3e970deac1 100644
--- a/engines/ultima/nuvie/nuvie.h
+++ b/engines/ultima/nuvie/nuvie.h
@@ -23,7 +23,7 @@
#define NUVIE_NUVIE_H
#include "ultima/shared/engine/events.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/conf/configuration.h"
#include "common/archive.h"
#include "common/random.h"
@@ -68,7 +68,7 @@ protected:
*/
bool isDataRequired(Common::Path &folder, int &majorVersion, int &minorVersion);
public:
- const Std::string c_empty_string;
+ const Common::String c_empty_string;
public:
NuvieEngine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
~NuvieEngine() override;
diff --git a/engines/ultima/nuvie/save/save_game.cpp b/engines/ultima/nuvie/save/save_game.cpp
index c463f6a1304..22770a8f9be 100644
--- a/engines/ultima/nuvie/save/save_game.cpp
+++ b/engines/ultima/nuvie/save/save_game.cpp
@@ -135,7 +135,7 @@ bool SaveGame::load_new() {
}
bool SaveGame::load_original() {
- Std::string objblk_filename;
+ Common::String objblk_filename;
Common::Path path, objlist_filename;
char x, y;
uint16 len;
@@ -436,7 +436,7 @@ void SaveGame::update_objlist_for_new_game() {
}
void SaveGame::update_objlist_for_new_game_u6() {
- Std::string name = "";
+ Common::String name = "";
config->value("config/newgamedata/name", name, "Avatar");
objlist.seek(0xf00);
@@ -486,7 +486,7 @@ void SaveGame::update_objlist_for_new_game_u6() {
}
void SaveGame::update_objlist_for_new_game_se() {
- Std::string name = "";
+ Common::String name = "";
config->value("config/newgamedata/name", name, "Avatar");
objlist.seek(0xf00);
@@ -517,7 +517,7 @@ void SaveGame::update_objlist_for_new_game_se() {
}
void SaveGame::update_objlist_for_new_game_md() {
- Std::string name = "";
+ Common::String name = "";
int gender;
config->value("config/newgamedata/gender", gender, 0);
diff --git a/engines/ultima/nuvie/save/save_game.h b/engines/ultima/nuvie/save/save_game.h
index 173620b87fc..682b50d3e2b 100644
--- a/engines/ultima/nuvie/save/save_game.h
+++ b/engines/ultima/nuvie/save/save_game.h
@@ -26,7 +26,7 @@
#define SAVE_VERSION_MINOR 0
#define SAVE_VERSION (SAVE_VERSION_MAJOR * 256 + SAVE_VERSION_MINOR)
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/files/nuvie_io_file.h"
namespace Ultima {
diff --git a/engines/ultima/nuvie/screen/dither.cpp b/engines/ultima/nuvie/screen/dither.cpp
index b95872458d6..c0c91268cf0 100644
--- a/engines/ultima/nuvie/screen/dither.cpp
+++ b/engines/ultima/nuvie/screen/dither.cpp
@@ -64,7 +64,7 @@ bool Dither::load_data() {
}
void Dither::set_mode() {
- Std::string str_dither_mode;
+ Common::String str_dither_mode;
config->value("config/general/dither_mode", str_dither_mode);
diff --git a/engines/ultima/nuvie/screen/game_palette.cpp b/engines/ultima/nuvie/screen/game_palette.cpp
index f8819f304df..1f52eea80e9 100644
--- a/engines/ultima/nuvie/screen/game_palette.cpp
+++ b/engines/ultima/nuvie/screen/game_palette.cpp
@@ -53,7 +53,7 @@ bool GamePalette::loadPalette() {
uint16 i, j;
Common::Path filename;
NuvieIOFileRead file;
- Std::string game_name, game_id, pal_name;
+ Common::String game_name, game_id, pal_name;
config->value("config/GameName", game_name);
config->value("config/GameID", game_id);
@@ -109,7 +109,7 @@ bool GamePalette::loadPaletteIntoBuffer(unsigned char *pal) {
uint16 i, j;
Common::Path filename;
NuvieIOFileRead file;
- Std::string game_name, game_id, pal_name;
+ Common::String game_name, game_id, pal_name;
config->value("config/GameName", game_name);
config->value("config/GameID", game_id);
diff --git a/engines/ultima/nuvie/screen/screen.cpp b/engines/ultima/nuvie/screen/screen.cpp
index 5e8cb875847..349f1b004aa 100644
--- a/engines/ultima/nuvie/screen/screen.cpp
+++ b/engines/ultima/nuvie/screen/screen.cpp
@@ -45,7 +45,7 @@ Screen::Screen(const Configuration *cfg) : config(cfg), _rawSurface(nullptr),
non_square_pixels(false), shading_ambient(255), width(320), height(200) {
ARRAYCLEAR(shading_tile);
- Std::string str_lighting_style;
+ Common::String str_lighting_style;
config->value("config/general/lighting", str_lighting_style);
if (str_lighting_style == "none")
diff --git a/engines/ultima/nuvie/screen/screen.h b/engines/ultima/nuvie/screen/screen.h
index a961f3b613d..465a6937623 100644
--- a/engines/ultima/nuvie/screen/screen.h
+++ b/engines/ultima/nuvie/screen/screen.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_SCREEN_SCREEN_H
#define NUVIE_SCREEN_SCREEN_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/game.h"
#include "ultima/nuvie/screen/surface.h"
#include "graphics/screen.h"
diff --git a/engines/ultima/nuvie/script/script.cpp b/engines/ultima/nuvie/script/script.cpp
index 6295f7e3b4d..70a7f231e0d 100644
--- a/engines/ultima/nuvie/script/script.cpp
+++ b/engines/ultima/nuvie/script/script.cpp
@@ -882,14 +882,14 @@ Script::~Script() {
}
bool Script::init() {
- Std::string tmp;
+ Common::String tmp;
Common::Path dir, path;
config->value("config/datadir", tmp, "");
dir = Common::Path(tmp);
build_path(dir, "scripts", path);
dir = path;
- Std::string game_tag = get_game_tag(gametype);
+ Common::String game_tag = get_game_tag(gametype);
game_tag.toLowercase();
build_path(dir, game_tag, path);
@@ -898,12 +898,12 @@ bool Script::init() {
build_path(dir, "init.lua", path);
ConsoleAddInfo("Loading init.lua");
- Std::string init_str = "init = nuvie_load(\"";
+ Common::String init_str = "init = nuvie_load(\"";
init_str.append(game_tag);
init_str.append("/init.lua\"); init()");
if (run_script(init_str.c_str()) == false) {
- Std::string errorStr = "Loading ";
+ Common::String errorStr = "Loading ";
errorStr.append(path.toString('/'));
ConsoleAddError(errorStr);
return false;
@@ -937,7 +937,7 @@ bool Script::run_script(const char *scriptStr) {
}
bool Script::play_cutscene(const char *script_file) {
- string script_file_path = "";
+ Common::String script_file_path = "";
config->value("config/GameID", script_file_path);
script_file_path += script_file;
@@ -1391,7 +1391,7 @@ ScriptThread *Script::call_function_in_thread(const char *function_name) {
}
bool Script::run_lua_file(const char *filename) {
- Std::string tmp;
+ Common::String tmp;
Script::get_script()->get_config()->value("config/datadir", tmp, "");
Common::Path dir(tmp), path;
@@ -2354,7 +2354,7 @@ static int nscript_display_prompt(lua_State *L) {
*/
static int nscript_load(lua_State *L) {
const char *file = luaL_checkstring(L, 1);
- string tmp;
+ Common::String tmp;
Common::Path dir;
Common::Path path;
@@ -2382,7 +2382,7 @@ static int nscript_load(lua_State *L) {
static int nscript_config_get_boolean_value(lua_State *L) {
bool value;
const char *config_key = luaL_checkstring(L, 1);
- Script::get_script()->get_config()->value(Std::string(config_key), value);
+ Script::get_script()->get_config()->value(Common::String(config_key), value);
lua_pushboolean(L, value);
return 1;
@@ -2404,7 +2404,7 @@ static int nscript_config_get_game_type(lua_State *L) {
@return a two character string representing the currently selected language. "en" is the default if no language has been selected.
*/
static int nscript_config_get_language(lua_State *L) {
- Std::string value;
+ Common::String value;
Script::get_script()->get_config()->value(config_get_game_key(Script::get_script()->get_config()) + "/language", value, "en");
lua_pushstring(L, value.c_str());
return 1;
@@ -4261,7 +4261,7 @@ static int nscript_input_select(lua_State *L) {
AsyncEffect *e = new AsyncEffect(inputEffect);
e->run(EFFECT_PROCESS_GUI_INPUT);
- Std::string input = inputEffect->get_input();
+ Common::String input = inputEffect->get_input();
lua_pushstring(L, input.c_str());
@@ -4290,7 +4290,7 @@ static int nscript_input_select_integer(lua_State *L) {
AsyncEffect *e = new AsyncEffect(inputEffect);
e->run(EFFECT_PROCESS_GUI_INPUT);
- Std::string input = inputEffect->get_input();
+ Common::String input = inputEffect->get_input();
int num = (int)strtol(input.c_str(), (char **)nullptr, 10);
lua_pushinteger(L, num);
@@ -4604,7 +4604,7 @@ Loads text from a given LZC file.
*/
static int nscript_load_text_from_lzc(lua_State *L) {
unsigned char *buf = nullptr;
- Std::string filename(lua_tostring(L, 1));
+ Common::String filename(lua_tostring(L, 1));
U6Lib_n lib_n;
Common::Path path;
diff --git a/engines/ultima/nuvie/script/script.h b/engines/ultima/nuvie/script/script.h
index 27265f92b03..f1e2e8a5cfc 100644
--- a/engines/ultima/nuvie/script/script.h
+++ b/engines/ultima/nuvie/script/script.h
@@ -24,7 +24,7 @@
#include "common/lua/lua.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
#include "ultima/nuvie/gui/gui.h"
#include "ultima/nuvie/misc/u6_misc.h"
diff --git a/engines/ultima/nuvie/script/script_cutscene.cpp b/engines/ultima/nuvie/script/script_cutscene.cpp
index 1f4962833da..b4017f197a1 100644
--- a/engines/ultima/nuvie/script/script_cutscene.cpp
+++ b/engines/ultima/nuvie/script/script_cutscene.cpp
@@ -687,7 +687,7 @@ static int nscript_sprite_set(lua_State *L) {
}
if (!strcmp(key, "text")) {
const char *text = lua_tostring(L, 3);
- sprite->text = Std::string(text);
+ sprite->text = Common::String(text);
}
if (!strcmp(key, "text_color")) {
sprite->text_color = lua_tointeger(L, 3);
@@ -826,7 +826,7 @@ static int nscript_text_load(lua_State *L) {
const char *filename = lua_tostring(L, 1);
uint8 idx = lua_tointeger(L, 2);
- Std::vector<Std::string> text = cutScene->load_text(filename, idx);
+ Std::vector<Common::String> text = cutScene->load_text(filename, idx);
if (text.empty()) {
return 0;
@@ -1411,7 +1411,7 @@ Std::vector<CSMidGameData> ScriptCutscene::load_midgame_file(const char *filenam
CSMidGameData data;
for (int i = 0; i < 3; i++, idx++) {
unsigned char *buf = lib_n.get_item(idx, nullptr);
- data.text.push_back(string((const char *)buf));
+ data.text.push_back(Common::String((const char *)buf));
free(buf);
}
@@ -1449,10 +1449,10 @@ TransferSaveData ScriptCutscene::load_transfer_save() {
return data;
}
-Std::vector<Std::string> ScriptCutscene::load_text(const char *filename, uint8 idx) {
+Std::vector<Common::String> ScriptCutscene::load_text(const char *filename, uint8 idx) {
Common::Path path;
U6Lib_n lib_n;
- Std::vector<string> v;
+ Std::vector<Common::String> v;
unsigned char *buf = nullptr;
config_get_path(config, filename, path);
@@ -1468,7 +1468,7 @@ Std::vector<Std::string> ScriptCutscene::load_text(const char *filename, uint8 i
for (uint16 i = 0; i < len; i++) {
if (buf[i] == '\r') {
buf[i] = '\0';
- v.push_back(string((const char *)&buf[start]));
+ v.push_back(Common::String((const char *)&buf[start]));
i++;
buf[i] = '\0'; // skip the '\n' character
start = i + 1;
@@ -1485,14 +1485,14 @@ void ScriptCutscene::print_text(CSImage *image, const char *s, uint16 *x, uint16
int len = *x - startx;
size_t start = 0;
size_t found;
- Std::string str = s;
- Std::list<Std::string> tokens;
+ Common::String str = s;
+ Std::list<Common::String> tokens;
int space_width = font->getStringWidth(" ");
//uint16 x1 = startx;
found = str.findFirstOf(" ", start);
- while (found != string::npos) {
- Std::string token = str.substr(start, found - start);
+ while (found != Common::String::npos) {
+ Common::String token = str.substr(start, found - start);
int token_len = font->getStringWidth(token.c_str());
@@ -1502,7 +1502,7 @@ void ScriptCutscene::print_text(CSImage *image, const char *s, uint16 *x, uint16
if (tokens.size() > 1)
new_space = floor((width - (len - space_width * (tokens.size() - 1))) / (tokens.size() - 1));
- for (const Std::string &ss : tokens) {
+ for (const Common::String &ss : tokens) {
*x = ((WOUFont *)font)->drawStringToShape(image->shp, ss.c_str(), *x, *y, color);
*x += new_space;
}
@@ -1520,13 +1520,13 @@ void ScriptCutscene::print_text(CSImage *image, const char *s, uint16 *x, uint16
found = str.findFirstOf(" ", start);
}
- for (const Std::string &ss : tokens) {
+ for (const Common::String &ss : tokens) {
*x = ((WOUFont *)font)->drawStringToShape(image->shp, ss.c_str(), *x, *y, color);
*x += space_width;
}
if (start < str.size()) {
- Std::string token = str.substr(start, str.size() - start);
+ Common::String token = str.substr(start, str.size() - start);
if (len + font->getStringWidth(token.c_str()) > width) {
*y += 8;
*x = startx;
@@ -1713,16 +1713,16 @@ void ScriptCutscene::display_wrapped_text(CSSprite *s) {
size_t start = 0;
size_t found;
- Std::string str = s->text + "^";
- Std::list<Std::string> tokens;
+ Common::String str = s->text + "^";
+ Std::list<Common::String> tokens;
int y = s->y;
- Std::string line = "";
+ Common::String line = "";
found = str.findFirstOf("^", start);
- while (found != string::npos) {
- Std::string token = str.substr(start, found - start);
+ while (found != Common::String::npos) {
+ Common::String token = str.substr(start, found - start);
y = display_wrapped_text_line(token, text_color, s->x, y, s->text_align);
@@ -1731,25 +1731,25 @@ void ScriptCutscene::display_wrapped_text(CSSprite *s) {
}
}
-int ScriptCutscene::display_wrapped_text_line(Std::string str, uint8 text_color, int x, int y, uint8 align_val) {
+int ScriptCutscene::display_wrapped_text_line(Common::String str, uint8 text_color, int x, int y, uint8 align_val) {
//font->drawString(screen, s->text.c_str(), s->x + x_off, s->y + y_off, text_color, text_color);
int len = 0;
size_t start = 0;
size_t found;
str = str + " ";
- Std::list<Std::string> tokens;
+ Std::list<Common::String> tokens;
int space_width = font->getStringWidth(" ");
//uint16 x1 = startx;
int width = 320 - x * 2;
int char_height = font->getCharHeight();
- Std::string line = "";
+ Common::String line = "";
found = str.findFirstOf(" ", start);
- while (found != string::npos) {
- Std::string token = str.substr(start, found - start);
+ while (found != Common::String::npos) {
+ Common::String token = str.substr(start, found - start);
int token_len = font->getStringWidth(token.c_str());
diff --git a/engines/ultima/nuvie/script/script_cutscene.h b/engines/ultima/nuvie/script/script_cutscene.h
index 448c61ca708..23616dcadef 100644
--- a/engines/ultima/nuvie/script/script_cutscene.h
+++ b/engines/ultima/nuvie/script/script_cutscene.h
@@ -87,7 +87,7 @@ struct CSSprite {
CSImage *image;
bool visible;
Common::Rect clip_rect;
- Std::string text;
+ Common::String text;
uint16 text_color;
uint8 text_align;
@@ -105,7 +105,7 @@ struct CSSprite {
};
struct CSMidGameData {
- Std::vector<Std::string> text;
+ Std::vector<Common::String> text;
Std::vector<CSImage *> images;
};
@@ -147,7 +147,7 @@ public:
ScriptCutscene(GUI *g, Configuration *cfg, SoundManager *sm);
~ScriptCutscene() override;
- Std::vector<Std::string> load_text(const char *filename, uint8 idx);
+ Std::vector<Common::String> load_text(const char *filename, uint8 idx);
Std::vector<CSMidGameData> load_midgame_file(const char *filename);
@@ -219,7 +219,7 @@ private:
bool is_lzc(const char *filename);
CSImage *load_image_from_lzc(const Common::Path &filename, uint16 idx, uint16 sub_idx);
void display_wrapped_text(CSSprite *s);
- int display_wrapped_text_line(Std::string str, uint8 text_color, int x, int y, uint8 align_val);
+ int display_wrapped_text_line(Common::String str, uint8 text_color, int x, int y, uint8 align_val);
bool load_u4_save_file(TransferSaveData &saveData);
bool load_u5_save_file(TransferSaveData &saveData);
diff --git a/engines/ultima/nuvie/sound/adlib_sfx_manager.cpp b/engines/ultima/nuvie/sound/adlib_sfx_manager.cpp
index 0a8dd8207dc..b509151063d 100644
--- a/engines/ultima/nuvie/sound/adlib_sfx_manager.cpp
+++ b/engines/ultima/nuvie/sound/adlib_sfx_manager.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/sound/decoder/adlib_sfx_stream.h"
#include "ultima/nuvie/sound/adlib_sfx_manager.h"
diff --git a/engines/ultima/nuvie/sound/adplug/adplug_player.h b/engines/ultima/nuvie/sound/adplug/adplug_player.h
index 6ff4efdec33..2ac25f3f02f 100644
--- a/engines/ultima/nuvie/sound/adplug/adplug_player.h
+++ b/engines/ultima/nuvie/sound/adplug/adplug_player.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_SOUND_ADPLUG_ADPLUG_PLAYER
#define NUVIE_SOUND_ADPLUG_ADPLUG_PLAYER
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/sound/adplug/opl.h"
namespace Common {
@@ -48,15 +48,15 @@ public:
/***** Informational methods *****/
unsigned long songlength(int subsong = -1);
- virtual Std::string gettype() = 0; // returns file type
- virtual Std::string gettitle() { // returns song title
- return Std::string();
+ virtual Common::String gettype() = 0; // returns file type
+ virtual Common::String gettitle() { // returns song title
+ return Common::String();
}
- virtual Std::string getauthor() { // returns song author name
- return Std::string();
+ virtual Common::String getauthor() { // returns song author name
+ return Common::String();
}
- virtual Std::string getdesc() { // returns song description
- return Std::string();
+ virtual Common::String getdesc() { // returns song description
+ return Common::String();
}
virtual unsigned int getpatterns() { // returns number of patterns
return 0;
@@ -82,8 +82,8 @@ public:
virtual unsigned int getinstruments() { // returns number of instruments
return 0;
}
- virtual Std::string getinstrument(unsigned int n) { // returns n-th instrument name
- return Std::string();
+ virtual Common::String getinstrument(unsigned int n) { // returns n-th instrument name
+ return Common::String();
}
protected:
diff --git a/engines/ultima/nuvie/sound/adplug/mid.cpp b/engines/ultima/nuvie/sound/adplug/mid.cpp
index ae1b6736812..6017b8d901d 100644
--- a/engines/ultima/nuvie/sound/adplug/mid.cpp
+++ b/engines/ultima/nuvie/sound/adplug/mid.cpp
@@ -549,22 +549,22 @@ void CmidPlayer::load_ultima_midi_tracks() {
}
}
-Std::string CmidPlayer::gettype() {
+Common::String CmidPlayer::gettype() {
switch (type) {
case FILE_LUCAS:
- return Std::string("LucasArts AdLib MIDI");
+ return Common::String("LucasArts AdLib MIDI");
case FILE_MIDI:
- return Std::string("General MIDI");
+ return Common::String("General MIDI");
case FILE_CMF:
- return Std::string("Creative Music Format (CMF MIDI)");
+ return Common::String("Creative Music Format (CMF MIDI)");
case FILE_OLDLUCAS:
- return Std::string("Lucasfilm Adlib MIDI");
+ return Common::String("Lucasfilm Adlib MIDI");
case FILE_ADVSIERRA:
- return Std::string("Sierra On-Line VGA MIDI");
+ return Common::String("Sierra On-Line VGA MIDI");
case FILE_SIERRA:
- return Std::string("Sierra On-Line EGA MIDI");
+ return Common::String("Sierra On-Line EGA MIDI");
default:
- return Std::string("MIDI unknown");
+ return Common::String("MIDI unknown");
}
}
diff --git a/engines/ultima/nuvie/sound/adplug/mid.h b/engines/ultima/nuvie/sound/adplug/mid.h
index d38675ced5b..615ce38e0d1 100644
--- a/engines/ultima/nuvie/sound/adplug/mid.h
+++ b/engines/ultima/nuvie/sound/adplug/mid.h
@@ -35,20 +35,20 @@ public:
bool load(const Common::Path &filename) override;
bool load(const Common::Path &filename, int song_index);
- //bool load(const Std::string &filename, const CFileProvider &fp);
+ //bool load(const Common::String &filename, const CFileProvider &fp);
bool update() override;
void rewind(int subsong) override;
float getrefresh() override;
- Std::string gettype() override;
- Std::string gettitle() override {
- return Std::string(title);
+ Common::String gettype() override;
+ Common::String gettitle() override {
+ return Common::String(title);
}
- Std::string getauthor() override {
- return Std::string(author);
+ Common::String getauthor() override {
+ return Common::String(author);
}
- Std::string getdesc() override {
- return Std::string(remarks);
+ Common::String getdesc() override {
+ return Common::String(remarks);
}
unsigned int getinstruments() override {
return tins;
diff --git a/engines/ultima/nuvie/sound/adplug/u6m.h b/engines/ultima/nuvie/sound/adplug/u6m.h
index e789c08eecb..e84c449b047 100644
--- a/engines/ultima/nuvie/sound/adplug/u6m.h
+++ b/engines/ultima/nuvie/sound/adplug/u6m.h
@@ -46,8 +46,8 @@ public:
void rewind(int subsong) override;
float getrefresh() override;
- Std::string gettype() override {
- return Std::string("Ultima 6 Music");
+ Common::String gettype() override {
+ return Common::String("Ultima 6 Music");
};
diff --git a/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h b/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
index 75086eb42e3..2b8ffcbd704 100644
--- a/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_SOUND_MIXER_DECODER_ADLIB_SFX_STREAM_H
#define NUVIE_SOUND_MIXER_DECODER_ADLIB_SFX_STREAM_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/sound/adplug/opl_class.h"
#include "audio/audiostream.h"
@@ -33,8 +33,6 @@ class OriginFXAdLibDriver;
class Configuration;
-using Std::string;
-
class AdLibSfxStream : public Audio::RewindableAudioStream {
public:
AdLibSfxStream() {
diff --git a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
index cf22bdf9abc..41ed44fb410 100644
--- a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_SOUND_MIXER_DECODER_PC_SPEAKER_STREAM_H
#define NUVIE_SOUND_MIXER_DECODER_PC_SPEAKER_STREAM_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/sound/decoder/pc_speaker.h"
#include "audio/audiostream.h"
diff --git a/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h b/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
index 0a6bf0cea05..ec9c9ec0ef9 100644
--- a/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
@@ -20,7 +20,7 @@
#ifndef NUVIE_SOUND_ADPLUG_ADPLUG_DECODER_STREAM_H
#define NUVIE_SOUND_ADPLUG_ADPLUG_DECODER_STREAM_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/sound/adplug/emu_opl.h"
#include "ultima/nuvie/sound/adplug/opl.h"
#include "ultima/nuvie/sound/adplug/u6m.h"
@@ -33,7 +33,6 @@ namespace Nuvie {
class U6Lib_n;
class U6Lzw;
class NuvieIOBuffer;
-using Std::string;
class U6AdPlugDecoderStream : public Audio::RewindableAudioStream {
public:
diff --git a/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.cpp b/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.cpp
index 3a7d7fd8a83..7f359075663 100644
--- a/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.cpp
+++ b/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/sound/pc_speaker_sfx_manager.h"
#include "ultima/nuvie/sound/decoder/adlib_sfx_stream.h"
diff --git a/engines/ultima/nuvie/sound/sound.h b/engines/ultima/nuvie/sound/sound.h
index 61b8908a9f0..22190e6171e 100644
--- a/engines/ultima/nuvie/sound/sound.h
+++ b/engines/ultima/nuvie/sound/sound.h
@@ -23,13 +23,12 @@
#define NUVIE_SOUND_SOUND_H
#include "ultima/nuvie/core/game.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
namespace Ultima {
namespace Nuvie {
-using Std::string;
using Std::list;
using Std::vector;
@@ -40,20 +39,20 @@ public:
virtual bool Stop() = 0;
virtual bool FadeOut(float seconds) = 0;
virtual bool SetVolume(uint8 volume) = 0; //range 0..255
- const string &GetName() const {
+ const Common::String &GetName() const {
return m_Filename;
}
- string GetTitle() {
+ Common::String GetTitle() {
return m_Title;
}
- string GetId() {
+ Common::String GetId() {
return m_FileId;
}
protected:
// TODO: determine if filename should be a Common::Path
- string m_Filename;
- string m_Title;
- string m_FileId;
+ Common::String m_Filename;
+ Common::String m_Title;
+ Common::String m_FileId;
// static SoundManager *gpSM;
};
diff --git a/engines/ultima/nuvie/sound/sound_manager.cpp b/engines/ultima/nuvie/sound/sound_manager.cpp
index e8bc939a095..af236ef41a6 100644
--- a/engines/ultima/nuvie/sound/sound_manager.cpp
+++ b/engines/ultima/nuvie/sound/sound_manager.cpp
@@ -135,11 +135,11 @@ SoundManager::~SoundManager() {
}
bool SoundManager::nuvieStartup(const Configuration *config) {
- Std::string config_key;
- Std::string music_style;
- Std::string music_cfg_file; //full path and filename to music.cfg
- Std::string sound_dir;
- Std::string sfx_style;
+ Common::String config_key;
+ Common::String music_style;
+ Common::String music_cfg_file; //full path and filename to music.cfg
+ Common::String sound_dir;
+ Common::String sfx_style;
m_Config = config;
@@ -241,7 +241,7 @@ bool SoundManager::LoadNativeU6Songs() {
Song *song;
Common::Path filename;
- string fileId;
+ Common::String fileId;
fileId = "brit.m";
config_get_path(m_Config, fileId, filename);
@@ -378,15 +378,15 @@ bool SoundManager::groupAddSong(const char *group, Song *song) {
}
/*
-bool SoundManager::LoadObjectSamples (string sound_dir)
+bool SoundManager::LoadObjectSamples (Common::String sound_dir)
{
char seps[] = ";\r\n";
char *token1;
char *token2;
NuvieIOFileRead niof;
char *sz;
- string samplename;
- string scriptname;
+ Common::String samplename;
+ Common::String scriptname;
build_path(sound_dir, "obj_samples.cfg", scriptname);
@@ -437,15 +437,15 @@ bool SoundManager::LoadObjectSamples (string sound_dir)
return true;
};
-bool SoundManager::LoadTileSamples (string sound_dir)
+bool SoundManager::LoadTileSamples (Common::String sound_dir)
{
char seps[] = ";\r\n";
char *token1;
char *token2;
NuvieIOFileRead niof;
char *sz;
- string samplename;
- string scriptname;
+ Common::String samplename;
+ Common::String scriptname;
build_path(sound_dir, "tile_samples.cfg", scriptname);
@@ -499,7 +499,7 @@ bool SoundManager::LoadTileSamples (string sound_dir)
return true;
};
*/
-bool SoundManager::LoadSfxManager(string sfx_style) {
+bool SoundManager::LoadSfxManager(Common::String sfx_style) {
if (m_SfxManager != nullptr) {
return false;
}
@@ -534,7 +534,7 @@ bool SoundManager::LoadSfxManager(string sfx_style) {
return true;
}
-void SoundManager::musicPlayFrom(string group) {
+void SoundManager::musicPlayFrom(Common::String group) {
Common::StackLock lock(_musicMutex);
if (!music_enabled || !audio_enabled)
@@ -644,7 +644,7 @@ void SoundManager::update_map_sfx() {
if (sfx_enabled == false)
return;
- string next_group = "";
+ Common::String next_group = "";
Player *p = Game::get_game()->get_player();
MapWindow *mw = Game::get_game()->get_map_window();
@@ -762,7 +762,7 @@ void SoundManager::update() {
}
}
-Sound *SoundManager::SongExists(const string &name) {
+Sound *SoundManager::SongExists(const Common::String &name) {
for (Sound *song : m_Songs) {
if (song->GetName() == name)
return song;
@@ -771,7 +771,7 @@ Sound *SoundManager::SongExists(const string &name) {
return nullptr;
}
-Sound *SoundManager::SampleExists(const string &name) {
+Sound *SoundManager::SampleExists(const Common::String &name) {
for (Sound *sample : m_Samples) {
if (sample->GetName() == name)
return sample;
@@ -813,7 +813,7 @@ uint16 SoundManager::RequestObjectSfxId(uint16 obj_n) {
return NUVIE_SFX_NONE;
}
-Sound *SoundManager::RequestSong(const string &group) {
+Sound *SoundManager::RequestSong(const Common::String &group) {
Common::HashMap<Common::String, SoundCollection * >::iterator it;
it = m_MusicMap.find(group);
if (it != m_MusicMap.end()) {
diff --git a/engines/ultima/nuvie/sound/sound_manager.h b/engines/ultima/nuvie/sound/sound_manager.h
index fe188449449..fa493270006 100644
--- a/engines/ultima/nuvie/sound/sound_manager.h
+++ b/engines/ultima/nuvie/sound/sound_manager.h
@@ -78,7 +78,7 @@ public:
void update_map_sfx(); //updates the active sounds
void update(); // at the moment this just changes songs if required
- void musicPlayFrom(string group);
+ void musicPlayFrom(Common::String group);
void musicPause();
void musicPlay();
@@ -135,17 +135,17 @@ private:
bool loadSong(Song *song, const Common::Path &filename, const char *fileId, const char *title);
bool groupAddSong(const char *group, Song *song);
- //bool LoadObjectSamples(string sound_dir);
- //bool LoadTileSamples(string sound_dir);
- bool LoadSfxManager(string sfx_style);
+ //bool LoadObjectSamples(Common::String sound_dir);
+ //bool LoadTileSamples(Common::String sound_dir);
+ bool LoadSfxManager(Common::String sfx_style);
- Sound *SongExists(const string &name); //have we loaded this sound before?
- Sound *SampleExists(const string &name); //have we loaded this sound before?
+ Sound *SongExists(const Common::String &name); //have we loaded this sound before?
+ Sound *SampleExists(const Common::String &name); //have we loaded this sound before?
Sound *RequestTileSound(int id);
Sound *RequestObjectSound(int id);
- Sound *RequestSong(const string &group); //request a song from this group
+ Sound *RequestSong(const Common::String &group); //request a song from this group
uint16 RequestObjectSfxId(uint16 obj_n);
@@ -159,7 +159,7 @@ private:
const Configuration *m_Config;
//state info:
- string m_CurrentGroup;
+ Common::String m_CurrentGroup;
Sound *m_pCurrentSong;
list<SoundManagerSfx> m_ActiveSounds;
bool audio_enabled;
diff --git a/engines/ultima/nuvie/sound/towns_sfx_manager.cpp b/engines/ultima/nuvie/sound/towns_sfx_manager.cpp
index e8e271b0eea..884e615f575 100644
--- a/engines/ultima/nuvie/sound/towns_sfx_manager.cpp
+++ b/engines/ultima/nuvie/sound/towns_sfx_manager.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "audio/mixer.h"
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.cpp b/engines/ultima/nuvie/usecode/u6_usecode.cpp
index d0c6f231624..5c05107d4cc 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.cpp
+++ b/engines/ultima/nuvie/usecode/u6_usecode.cpp
@@ -309,7 +309,7 @@ bool U6UseCode::message_obj(Obj *obj, CallbackMessage msg, void *msg_data) {
items.ent_ref = (MapEntity *)msg_data;
break;
case MESG_TEXT_READY:
- items.string_ref = (string *)msg_data;
+ items.string_ref = (Common::String *)msg_data;
break;
case MESG_DATA_READY:
items.data_ref = (char *)msg_data; // pointer to EventInput structure
@@ -1427,7 +1427,7 @@ bool U6UseCode::use_rubber_ducky(Obj *obj, UseCodeEvent ev) {
return true;
}
-sint16 U6UseCode::parseLatLongString(U6UseCodeLatLonEnum mode, Std::string *input) {
+sint16 U6UseCode::parseLatLongString(U6UseCodeLatLonEnum mode, Common::String *input) {
uint16 len = input->size();
sint16 val = 0;
for (uint16 i = 0; i < len; i++) {
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.h b/engines/ultima/nuvie/usecode/u6_usecode.h
index d2b91cca392..85d0eeebcc4 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.h
+++ b/engines/ultima/nuvie/usecode/u6_usecode.h
@@ -216,7 +216,7 @@ protected:
void extinguish_torch(Obj *obj);
void light_torch(Obj *obj);
bool process_effects(Obj *container_obj, Actor *actor) override;
- sint16 parseLatLongString(U6UseCodeLatLonEnum mode, Std::string *input);
+ sint16 parseLatLongString(U6UseCodeLatLonEnum mode, Common::String *input);
inline bool use_find_water(uint16 *x, uint16 *y, uint8 *z);
inline bool lock_pick_dex_check();
diff --git a/engines/ultima/nuvie/usecode/usecode.cpp b/engines/ultima/nuvie/usecode/usecode.cpp
index 25633ed0d09..a2fdc108804 100644
--- a/engines/ultima/nuvie/usecode/usecode.cpp
+++ b/engines/ultima/nuvie/usecode/usecode.cpp
@@ -196,7 +196,7 @@ Obj *UseCode::get_obj_from_container(Obj *obj) {
/* Print name of event being sent and the object receiving it.
*/
void UseCode::dbg_print_event(UseCodeEvent event, Obj *obj) {
- string do_string = "";
+ Common::String do_string = "";
switch (event) {
case USE_EVENT_USE:
do_string = "Use";
diff --git a/engines/ultima/nuvie/usecode/usecode.h b/engines/ultima/nuvie/usecode/usecode.h
index 0acea26d6da..3f742d0b9b6 100644
--- a/engines/ultima/nuvie/usecode/usecode.h
+++ b/engines/ultima/nuvie/usecode/usecode.h
@@ -22,7 +22,7 @@
#ifndef NUVIE_USECODE_USECODE_H
#define NUVIE_USECODE_USECODE_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/misc/call_back.h"
#include "ultima/nuvie/misc/map_entity.h"
#include "ultima/nuvie/core/obj_manager.h"
@@ -171,7 +171,7 @@ protected:
Actor *actor_ref, *actor2_ref;
MapCoord *mapcoord_ref;
CallbackMessage *msg_ref;
- Std::string *string_ref;
+ Common::String *string_ref;
MapEntity *ent_ref;
char *data_ref;
} items;
diff --git a/engines/ultima/nuvie/views/container_view_gump.cpp b/engines/ultima/nuvie/views/container_view_gump.cpp
index beba77cac40..2b9b98a2fac 100644
--- a/engines/ultima/nuvie/views/container_view_gump.cpp
+++ b/engines/ultima/nuvie/views/container_view_gump.cpp
@@ -203,7 +203,7 @@ void ContainerViewGump::init_barrel(const Common::Path &datadir) {
AddWidget(container_widget);
}
-void ContainerViewGump::init_corpse(const Common::Path &datadir, Std::string bg_filename) {
+void ContainerViewGump::init_corpse(const Common::Path &datadir, Common::String bg_filename) {
Common::Path imagefile, path;
uint8 check_y = 25;
gump_button = loadButton(datadir, "gump", CHECK_X, check_y);
diff --git a/engines/ultima/nuvie/views/container_view_gump.h b/engines/ultima/nuvie/views/container_view_gump.h
index c0e0b55cb91..9bd3f277dfc 100644
--- a/engines/ultima/nuvie/views/container_view_gump.h
+++ b/engines/ultima/nuvie/views/container_view_gump.h
@@ -96,7 +96,7 @@ protected:
void init_chest(const Common::Path &datadir);
void init_crate(const Common::Path &datadir);
void init_barrel(const Common::Path &datadir);
- void init_corpse(const Common::Path &datadir, Std::string bg_filename);
+ void init_corpse(const Common::Path &datadir, Common::String bg_filename);
void display_inventory_weight();
void left_arrow();
diff --git a/engines/ultima/nuvie/views/portrait_view.cpp b/engines/ultima/nuvie/views/portrait_view.cpp
index f49f980d1b0..a84f960189d 100644
--- a/engines/ultima/nuvie/views/portrait_view.cpp
+++ b/engines/ultima/nuvie/views/portrait_view.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
@@ -44,7 +44,7 @@ namespace Nuvie {
PortraitView::PortraitView(const Configuration *cfg) : View(cfg),
portrait_data(nullptr), portrait(nullptr), bg_data(nullptr),
- name_string(new string), show_cursor(false), doll_widget(nullptr),
+ name_string(new Common::String), show_cursor(false), doll_widget(nullptr),
waiting(false), display_doll(false), cur_actor_num(0) {
gametype = get_game_type(cfg);
diff --git a/engines/ultima/nuvie/views/portrait_view.h b/engines/ultima/nuvie/views/portrait_view.h
index fca76c8379e..f6a3c15ebff 100644
--- a/engines/ultima/nuvie/views/portrait_view.h
+++ b/engines/ultima/nuvie/views/portrait_view.h
@@ -45,7 +45,7 @@ class PortraitView : public View {
uint8 cur_actor_num;
Portrait *portrait;
- Std::string *name_string;
+ Common::String *name_string;
unsigned char *portrait_data;
U6Shape *bg_data;
diff --git a/engines/ultima/nuvie/views/scroll_view_gump.cpp b/engines/ultima/nuvie/views/scroll_view_gump.cpp
index 1d3e165c82d..3cdff1bd46d 100644
--- a/engines/ultima/nuvie/views/scroll_view_gump.cpp
+++ b/engines/ultima/nuvie/views/scroll_view_gump.cpp
@@ -41,7 +41,7 @@ ScrollViewGump::~ScrollViewGump() {
}
-bool ScrollViewGump::init(Screen *tmp_screen, void *view_manager, Font *f, Party *p, TileManager *tm, ObjManager *om, Std::string text_string) {
+bool ScrollViewGump::init(Screen *tmp_screen, void *view_manager, Font *f, Party *p, TileManager *tm, ObjManager *om, Common::String text_string) {
uint16 x_off = Game::get_game()->get_game_x_offset();
uint16 y_off = Game::get_game()->get_game_y_offset();
@@ -51,9 +51,9 @@ bool ScrollViewGump::init(Screen *tmp_screen, void *view_manager, Font *f, Party
View::init(x_off, y_off, f, p, tm, om);
SetRect(area.left, area.top, SIGN_BG_W, SIGN_BG_H);
/*
- Std::string datadir = GUI::get_gui()->get_data_dir();
- Std::string imagefile;
- Std::string path;
+ Common::String datadir = GUI::get_gui()->get_data_dir();
+ Common::String imagefile;
+ Common::String path;
build_path(datadir, "images", path);
datadir = path;
diff --git a/engines/ultima/nuvie/views/scroll_view_gump.h b/engines/ultima/nuvie/views/scroll_view_gump.h
index 92267e1bdf0..873b021f603 100644
--- a/engines/ultima/nuvie/views/scroll_view_gump.h
+++ b/engines/ultima/nuvie/views/scroll_view_gump.h
@@ -41,7 +41,7 @@ public:
ScrollViewGump(const Configuration *cfg);
~ScrollViewGump() override;
- bool init(Screen *tmp_screen, void *view_manager, Font *f, Party *p, TileManager *tm, ObjManager *om, Std::string text_string);
+ bool init(Screen *tmp_screen, void *view_manager, Font *f, Party *p, TileManager *tm, ObjManager *om, Common::String text_string);
void Display(bool full_redraw) override;
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.cpp b/engines/ultima/nuvie/views/scroll_widget_gump.cpp
index 30bd78ef6cb..6a0142fa279 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.cpp
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/nuvie/core/nuvie_defs.h"
#include "ultima/nuvie/conf/configuration.h"
#include "ultima/nuvie/misc/u6_misc.h"
@@ -102,7 +102,7 @@ bool ScrollWidgetGump::parse_token(MsgText *token) {
return MsgScroll::parse_token(token);
}
-void ScrollWidgetGump::display_string(const Std::string &s) {
+void ScrollWidgetGump::display_string(const Common::String &s) {
MsgScroll::display_string(s);
update_arrows();
}
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.h b/engines/ultima/nuvie/views/scroll_widget_gump.h
index 4757d72f3e3..180d1ccd30f 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.h
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.h
@@ -27,7 +27,7 @@
#include "ultima/nuvie/gui/widgets/msg_scroll.h"
#include "ultima/nuvie/fonts/font.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Nuvie {
@@ -61,7 +61,7 @@ class ScrollWidgetGump: public MsgScroll {
uint8 font_highlight;
uint16 position;
- Std::string trailing_whitespace;
+ Common::String trailing_whitespace;
bool show_up_arrow;
bool show_down_arrow;
@@ -80,8 +80,8 @@ public:
void Display(bool full_redraw) override;
void display_prompt() override {}
- void display_string(const Std::string &s);
- void display_string(const Std::string &s, Font *f, bool include_on_map_window) override {
+ void display_string(const Common::String &s);
+ void display_string(const Common::String &s, Font *f, bool include_on_map_window) override {
return MsgScroll::display_string(s, f, include_on_map_window);
}
diff --git a/engines/ultima/nuvie/views/spell_view_gump.cpp b/engines/ultima/nuvie/views/spell_view_gump.cpp
index 45842164661..5493e2e13a2 100644
--- a/engines/ultima/nuvie/views/spell_view_gump.cpp
+++ b/engines/ultima/nuvie/views/spell_view_gump.cpp
@@ -174,7 +174,7 @@ void SpellViewGump::loadCircleString(const Common::Path &datadir) {
}
}
-void SpellViewGump::loadCircleSuffix(const Common::Path &datadir, const Std::string &image) {
+void SpellViewGump::loadCircleSuffix(const Common::Path &datadir, const Common::String &image) {
Common::Path imagefile;
build_path(datadir, image, imagefile);
diff --git a/engines/ultima/nuvie/views/spell_view_gump.h b/engines/ultima/nuvie/views/spell_view_gump.h
index 8e85eaf528e..e9ae78099c7 100644
--- a/engines/ultima/nuvie/views/spell_view_gump.h
+++ b/engines/ultima/nuvie/views/spell_view_gump.h
@@ -71,7 +71,7 @@ protected:
uint8 fill_cur_spell_list() override;
void loadCircleString(const Common::Path &datadir);
- void loadCircleSuffix(const Common::Path &datadir, const Std::string &image);
+ void loadCircleSuffix(const Common::Path &datadir, const Common::String &image);
void printSpellQty(uint8 spell_num, uint16 x, uint16 y);
void close_spellbook();
diff --git a/engines/ultima/nuvie/views/view.cpp b/engines/ultima/nuvie/views/view.cpp
index d47255029e3..f9377f53748 100644
--- a/engines/ultima/nuvie/views/view.cpp
+++ b/engines/ultima/nuvie/views/view.cpp
@@ -192,7 +192,7 @@ GUI_status View::callback(uint16 msg, GUI_CallBack *caller, void *data) {
return GUI_PASS;
}
-GUI_Button *View::loadButton(const Common::Path &dir, Std::string name, uint16 x, uint16 y) {
+GUI_Button *View::loadButton(const Common::Path &dir, Common::String name, uint16 x, uint16 y) {
GUI_Button *button;
Common::Path imagefile;
diff --git a/engines/ultima/nuvie/views/view.h b/engines/ultima/nuvie/views/view.h
index 7aff41869a6..397c0e5ef69 100644
--- a/engines/ultima/nuvie/views/view.h
+++ b/engines/ultima/nuvie/views/view.h
@@ -76,7 +76,7 @@ public:
protected:
GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
- GUI_Button *loadButton(const Common::Path &dir, Std::string name, uint16 x, uint16 y);
+ GUI_Button *loadButton(const Common::Path &dir, Common::String name, uint16 x, uint16 y);
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/views/view_manager.cpp b/engines/ultima/nuvie/views/view_manager.cpp
index 9bccdf3d170..b8a5c874044 100644
--- a/engines/ultima/nuvie/views/view_manager.cpp
+++ b/engines/ultima/nuvie/views/view_manager.cpp
@@ -407,7 +407,7 @@ void ViewManager::open_sign_gump(const char *sign_text, uint16 length) {
void ViewManager::open_scroll_gump(const char *text, uint16 length) {
if (Game::get_game()->is_using_text_gumps()) { // check should be useless
ScrollViewGump *view = new ScrollViewGump(config);
- view->init(Game::get_game()->get_screen(), this, font, party, tile_manager, obj_manager, string(text, length));
+ view->init(Game::get_game()->get_screen(), this, font, party, tile_manager, obj_manager, Common::String(text, length));
add_view((View *)view);
add_gump(view);
view->grab_focus();
diff --git a/engines/ultima/shared/std/string.h b/engines/ultima/shared/std/string.h
deleted file mode 100644
index 5f2ce913024..00000000000
--- a/engines/ultima/shared/std/string.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ULTIMA_STD_STRING_H
-#define ULTIMA_STD_STRING_H
-
-#include "common/str.h"
-
-namespace Ultima {
-namespace Std {
-
-class string final : public Common::String {
-public:
- constexpr string() : Common::String() {}
- string(const char *str) : Common::String(str) {}
- string(const char *str, uint32 len) : Common::String(str, len) {}
- string(const char *beginP, const char *endP) : Common::String(beginP, endP) {}
- string(const String &str) : Common::String(str) {}
- explicit constexpr string(char c) : Common::String(c) {}
- string(size_t n, char c) : Common::String(n, c) {}
-};
-
-} // End of namespace Std
-} // End of namespace Ultima
-
-#endif
diff --git a/engines/ultima/ultima4/game/armor.h b/engines/ultima/ultima4/game/armor.h
index b9bacbeade9..51ca648a550 100644
--- a/engines/ultima/ultima4/game/armor.h
+++ b/engines/ultima/ultima4/game/armor.h
@@ -24,7 +24,7 @@
#include "ultima/ultima4/filesys/savegame.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima4 {
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 60349613132..2557b6f2ea6 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -196,7 +196,7 @@ bool AudioProcess::loadData(Common::ReadStream *rs, uint32 version) {
char *buf = new char[slen + 1];
rs->read(buf, slen);
buf[slen] = 0;
- Std::string text = buf;
+ Common::String text = buf;
delete[] buf;
playSpeech(text, priority, objId, pitchShift, volume);
@@ -332,7 +332,7 @@ void AudioProcess::setVolumeForObjectSFX(ObjId objId, int sfxNum, uint8 volume)
// Speech
//
-bool AudioProcess::playSpeech(const Std::string &barked, int shapeNum, ObjId objId, uint32 pitchShift, uint16 volume) {
+bool AudioProcess::playSpeech(const Common::String &barked, int shapeNum, ObjId objId, uint32 pitchShift, uint16 volume) {
SpeechFlex *speechflex = GameData::get_instance()->getSpeechFlex(shapeNum);
if (!speechflex) return false;
@@ -376,7 +376,7 @@ bool AudioProcess::playSpeech(const Std::string &barked, int shapeNum, ObjId obj
return true;
}
-uint32 AudioProcess::getSpeechLength(const Std::string &barked, int shapenum) const {
+uint32 AudioProcess::getSpeechLength(const Common::String &barked, int shapenum) const {
SpeechFlex *speechflex = GameData::get_instance()->getSpeechFlex(shapenum);
if (!speechflex) return 0;
@@ -384,7 +384,7 @@ uint32 AudioProcess::getSpeechLength(const Std::string &barked, int shapenum) co
}
-void AudioProcess::stopSpeech(const Std::string &barked, int shapenum, ObjId objId) {
+void AudioProcess::stopSpeech(const Common::String &barked, int shapenum, ObjId objId) {
AudioMixer *mixer = AudioMixer::get_instance();
Std::list<SampleInfo>::iterator it;
@@ -399,7 +399,7 @@ void AudioProcess::stopSpeech(const Std::string &barked, int shapenum, ObjId obj
}
}
-bool AudioProcess::isSpeechPlaying(const Std::string &barked, int shapeNum) {
+bool AudioProcess::isSpeechPlaying(const Common::String &barked, int shapeNum) {
Std::list<SampleInfo>::iterator it;
for (auto &si : _sampleInfo) {
if (si._sfxNum == -1 && si._priority == shapeNum &&
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index 0e2e9cad8de..058e7c22fe0 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -24,7 +24,7 @@
#include "ultima/ultima8/kernel/process.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/misc/classtype.h"
namespace Ultima {
@@ -43,7 +43,7 @@ public:
ObjId _objId;
int32 _loops;
int32 _channel;
- Std::string _barked;
+ Common::String _barked;
uint32 _curSpeechStart, _curSpeechEnd;
uint32 _pitchShift; // PITCH_SHIFT_NONE is normal
uint16 _volume; // 0-255
@@ -56,7 +56,7 @@ public:
_sfxNum(s), _priority(p), _objId(o), _loops(l), _channel(c),
_pitchShift(ps), _volume(v), _calcVol(cv), _balance(bal),
_curSpeechStart(0), _curSpeechEnd(0), _ambient(ambient) { }
- SampleInfo(const Std::string &b, int32 shpnum, ObjId o, int32 c,
+ SampleInfo(const Common::String &b, int32 shpnum, ObjId o, int32 c,
uint32 s, uint32 e, uint32 ps, uint16 v, int16 cv, int8 bal, bool ambient) :
_sfxNum(-1), _priority(shpnum), _objId(o), _loops(0), _channel(c), _barked(b),
_curSpeechStart(s), _curSpeechEnd(e), _pitchShift(ps), _volume(v),
@@ -108,13 +108,13 @@ public:
void setVolumeSFX(int sfxNum, uint8 volume);
void setVolumeForObjectSFX(ObjId objId, int sfxNum, uint8 volume);
- bool playSpeech(const Std::string &barked, int shapenum, ObjId objId,
+ bool playSpeech(const Common::String &barked, int shapenum, ObjId objId,
uint32 pitchShift = PITCH_SHIFT_NONE, uint16 volume = 255);
- void stopSpeech(const Std::string &barked, int shapenum, ObjId objId);
- bool isSpeechPlaying(const Std::string &barked, int shapenum);
+ void stopSpeech(const Common::String &barked, int shapenum, ObjId objId);
+ bool isSpeechPlaying(const Common::String &barked, int shapenum);
//! get length (in milliseconds) of speech
- uint32 getSpeechLength(const Std::string &barked, int shapenum) const;
+ uint32 getSpeechLength(const Common::String &barked, int shapenum) const;
//! play a sample (without storing a SampleInfo)
//! returns channel sample is played on, or -1
diff --git a/engines/ultima/ultima8/audio/cru_music_process.cpp b/engines/ultima/ultima8/audio/cru_music_process.cpp
index 906a0bf7130..d86429a9a89 100644
--- a/engines/ultima/ultima8/audio/cru_music_process.cpp
+++ b/engines/ultima/ultima8/audio/cru_music_process.cpp
@@ -183,7 +183,7 @@ void CruMusicProcess::playMusic_internal(int track) {
if (track > 0) {
// TODO: It's a bit ugly having this here. Should be in GameData.
- const Std::string fname = Std::string::format("sound/%s.amf", _trackNames[track]);
+ const Common::String fname = Common::String::format("sound/%s.amf", _trackNames[track]);
auto *rs = new Common::File();
if (!rs->open(Common::Path(fname))) {
// This happens in No Regret demo.
diff --git a/engines/ultima/ultima8/audio/music_flex.cpp b/engines/ultima/ultima8/audio/music_flex.cpp
index bd54c006dd5..3b94b92d39b 100644
--- a/engines/ultima/ultima8/audio/music_flex.cpp
+++ b/engines/ultima/ultima8/audio/music_flex.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/misc/debugger.h"
#include "ultima/ultima8/audio/music_flex.h"
@@ -109,7 +109,7 @@ void MusicFlex::loadSongInfo() {
error("Unable to load song info from sound/music.flx");
}
Common::MemoryReadStream ds(buf, size);
- Std::string line;
+ Common::String line;
// Read first section till we hit a #
for (;;) {
@@ -118,12 +118,12 @@ void MusicFlex::loadSongInfo() {
// We have hit the end of the section
if (line.at(0) == '#') break;
- Std::string::size_type begIdx, endIdx;
+ Common::String::size_type begIdx, endIdx;
// Find the first not space, which will get us the name
begIdx = line.findFirstNotOf(' ');
endIdx = line.findFirstOf(' ', begIdx);
- Std::string name = line.substr(begIdx, endIdx - begIdx);
+ Common::String name = line.substr(begIdx, endIdx - begIdx);
// Now find the first not space after the name, which will get us the num
begIdx = line.findFirstNotOf(' ', endIdx);
@@ -178,17 +178,17 @@ void MusicFlex::loadSongInfo() {
// We have hit the end of the section
if (line.at(0) == '#') break;
- Std::string::size_type begIdx, endIdx;
+ Common::String::size_type begIdx, endIdx;
// Get 'from' name
begIdx = line.findFirstNotOf(' ');
endIdx = line.findFirstOf(' ', begIdx);
- Std::string from = line.substr(begIdx, endIdx - begIdx);
+ Common::String from = line.substr(begIdx, endIdx - begIdx);
// Get 'to' name
begIdx = line.findFirstNotOf(' ', endIdx);
endIdx = line.findFirstOf(' ', begIdx);
- Std::string to = line.substr(begIdx, endIdx - begIdx);
+ Common::String to = line.substr(begIdx, endIdx - begIdx);
// Find index of from name
int fi;
@@ -217,10 +217,10 @@ void MusicFlex::loadSongInfo() {
begIdx = line.findFirstNotOf(' ', endIdx);
endIdx = line.findFirstOf(' ', begIdx);
- if (begIdx == Std::string::npos)
+ if (begIdx == Common::String::npos)
error("Invalid Section 4 song _info data. Unable to read _transitions for all measures");
- Std::string trans = line.substr(begIdx, endIdx - begIdx);
+ Common::String trans = line.substr(begIdx, endIdx - begIdx);
const char *str = trans.c_str();
int num = 0;
diff --git a/engines/ultima/ultima8/audio/sound_flex.cpp b/engines/ultima/ultima8/audio/sound_flex.cpp
index 18297df1b30..b5006bb0f91 100644
--- a/engines/ultima/ultima8/audio/sound_flex.cpp
+++ b/engines/ultima/ultima8/audio/sound_flex.cpp
@@ -49,7 +49,7 @@ SoundFlex::SoundFlex(Common::SeekableReadStream *rs) : Archive(rs), _samples(nul
// some info about how to play back the raw sounds (eg, loop points?)
while (!st.eos() && _index.size() < _count) {
uint32 data = st.readUint32LE();
- Std::string str;
+ Common::String str;
char c = st.readByte();
while (c != 0 && !st.eos()) {
str.push_back(c);
diff --git a/engines/ultima/ultima8/audio/sound_flex.h b/engines/ultima/ultima8/audio/sound_flex.h
index f4d29447993..f4ed8c1b315 100644
--- a/engines/ultima/ultima8/audio/sound_flex.h
+++ b/engines/ultima/ultima8/audio/sound_flex.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_AUDIO_SOUNDFLEX_H
#define ULTIMA8_AUDIO_SOUNDFLEX_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/filesys/archive.h"
namespace Ultima {
@@ -35,7 +35,7 @@ public:
SoundFlexEntry(const char *name, uint32 data) : _name(name), _data(data) {}
SoundFlexEntry(const char *name) : _name(name), _data(0) {}
- Std::string _name;
+ Common::String _name;
uint32 _data;
};
diff --git a/engines/ultima/ultima8/audio/speech_flex.cpp b/engines/ultima/ultima8/audio/speech_flex.cpp
index bda3384add7..bd354be7b95 100644
--- a/engines/ultima/ultima8/audio/speech_flex.cpp
+++ b/engines/ultima/ultima8/audio/speech_flex.cpp
@@ -39,16 +39,16 @@ SpeechFlex::SpeechFlex(Common::SeekableReadStream *rs) : SoundFlex(rs) {
unsigned int slen = 0;
while (off + slen < size && cbuf[off + slen])
slen++;
- Std::string text(cbuf + off, slen);
+ Common::String text(cbuf + off, slen);
text.replace('\t', ' ');
off += slen + 1;
- Std::string::size_type pos1 = text.findFirstNotOf(' ');
- if (pos1 == Std::string::npos) {
+ Common::String::size_type pos1 = text.findFirstNotOf(' ');
+ if (pos1 == Common::String::npos) {
text = "";
}
else {
- Std::string::size_type pos2 = text.findLastNotOf(' ');
+ Common::String::size_type pos2 = text.findLastNotOf(' ');
text = text.substr(pos1, pos2 - pos1 + 1);
}
@@ -63,18 +63,18 @@ SpeechFlex::SpeechFlex(Common::SeekableReadStream *rs) : SoundFlex(rs) {
SpeechFlex::~SpeechFlex(void) {
}
-int SpeechFlex::getIndexForPhrase(const Std::string &phrase,
+int SpeechFlex::getIndexForPhrase(const Common::String &phrase,
uint32 start, uint32 &end) const {
int i = 1;
- Std::string text = phrase.substr(start);
+ Common::String text = phrase.substr(start);
text.replace('\t', ' ');
- Std::string::size_type pos1 = text.findFirstNotOf(' ');
- if (pos1 == Std::string::npos)
+ Common::String::size_type pos1 = text.findFirstNotOf(' ');
+ if (pos1 == Common::String::npos)
return 0;
- Std::string::size_type pos2 = text.findLastNotOf(' ');
+ Common::String::size_type pos2 = text.findLastNotOf(' ');
text = text.substr(pos1, pos2 - pos1 + 1);
debug(6, "Looking for string: \"%s\"", text.c_str());
@@ -94,7 +94,7 @@ int SpeechFlex::getIndexForPhrase(const Std::string &phrase,
return 0;
}
-uint32 SpeechFlex::getSpeechLength(const Std::string &phrase) {
+uint32 SpeechFlex::getSpeechLength(const Common::String &phrase) {
uint32 start = 0, end = 0;
uint32 length = 0;
diff --git a/engines/ultima/ultima8/audio/speech_flex.h b/engines/ultima/ultima8/audio/speech_flex.h
index 49127f5354c..8e35544474b 100644
--- a/engines/ultima/ultima8/audio/speech_flex.h
+++ b/engines/ultima/ultima8/audio/speech_flex.h
@@ -29,17 +29,17 @@ namespace Ultima {
namespace Ultima8 {
class SpeechFlex : public SoundFlex {
- Std::vector<Std::string> _phrases;
+ Std::vector<Common::String> _phrases;
public:
SpeechFlex(Common::SeekableReadStream *rs);
~SpeechFlex(void) override;
- int getIndexForPhrase(const Std::string &phrase,
+ int getIndexForPhrase(const Common::String &phrase,
uint32 start, uint32 &end) const;
//! get total length (in milliseconds) of speech for a phrase
- uint32 getSpeechLength(const Std::string &phrase);
+ uint32 getSpeechLength(const Common::String &phrase);
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/conf/config_file_manager.cpp b/engines/ultima/ultima8/conf/config_file_manager.cpp
index 377f209ae16..6f4159fa21d 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.cpp
+++ b/engines/ultima/ultima8/conf/config_file_manager.cpp
@@ -27,8 +27,6 @@
namespace Ultima {
namespace Ultima8 {
-using Std::string;
-
ConfigFileManager *ConfigFileManager::_configFileManager = nullptr;
ConfigFileManager::ConfigFileManager() {
@@ -44,7 +42,7 @@ ConfigFileManager::~ConfigFileManager() {
_configFileManager = nullptr;
}
-bool ConfigFileManager::readConfigFile(const Common::Path &fname, const Std::string &category) {
+bool ConfigFileManager::readConfigFile(const Common::Path &fname, const Common::String &category) {
Common::File f;
if (!f.open(fname))
return false;
@@ -71,7 +69,7 @@ void ConfigFileManager::clear() {
_configFiles.clear();
}
-void ConfigFileManager::clearRoot(const Std::string &category) {
+void ConfigFileManager::clearRoot(const Common::String &category) {
Std::vector<ConfigFile *>::iterator i = _configFiles.begin();
while (i != _configFiles.end()) {
@@ -84,7 +82,7 @@ void ConfigFileManager::clearRoot(const Std::string &category) {
}
}
-bool ConfigFileManager::get(const Std::string &category, const Std::string §ion, const Std::string &key, string &ret) const {
+bool ConfigFileManager::get(const Common::String &category, const Common::String §ion, const Common::String &key, Common::String &ret) const {
for (int i = _configFiles.size() - 1; i >= 0; --i) {
const ConfigFile *file = _configFiles[i];
if (category.equalsIgnoreCase(file->_category)) {
@@ -98,8 +96,8 @@ bool ConfigFileManager::get(const Std::string &category, const Std::string §
}
-bool ConfigFileManager::get(const Std::string &category, const Std::string §ion, const Std::string &key, int &ret) const {
- string stringval;
+bool ConfigFileManager::get(const Common::String &category, const Common::String §ion, const Common::String &key, int &ret) const {
+ Common::String stringval;
if (!get(category, section, key, stringval))
return false;
@@ -107,8 +105,8 @@ bool ConfigFileManager::get(const Std::string &category, const Std::string §
return true;
}
-bool ConfigFileManager::get(const Std::string &category, const Std::string §ion, const Std::string &key, bool &ret) const {
- string stringval;
+bool ConfigFileManager::get(const Common::String &category, const Common::String §ion, const Common::String &key, bool &ret) const {
+ Common::String stringval;
if (!get(category, section, key, stringval))
return false;
@@ -116,8 +114,8 @@ bool ConfigFileManager::get(const Std::string &category, const Std::string §
return true;
}
-Std::vector<Std::string> ConfigFileManager::listSections(const Std::string &category) const {
- Std::vector<Std::string> sections;
+Std::vector<Common::String> ConfigFileManager::listSections(const Common::String &category) const {
+ Std::vector<Common::String> sections;
for (const auto *i : _configFiles) {
if (category.equalsIgnoreCase(i->_category)) {
Common::INIFile::SectionList sectionList = i->_iniFile.getSections();
@@ -130,7 +128,7 @@ Std::vector<Std::string> ConfigFileManager::listSections(const Std::string &cate
return sections;
}
-KeyMap ConfigFileManager::listKeyValues(const Std::string &category, const Std::string §ion) const {
+KeyMap ConfigFileManager::listKeyValues(const Common::String &category, const Common::String §ion) const {
KeyMap values;
for (const auto *c : _configFiles) {
if (category.equalsIgnoreCase(c->_category) && c->_iniFile.hasSection(section)) {
diff --git a/engines/ultima/ultima8/conf/config_file_manager.h b/engines/ultima/ultima8/conf/config_file_manager.h
index 513154a445b..6af7e2d9fab 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.h
+++ b/engines/ultima/ultima8/conf/config_file_manager.h
@@ -23,13 +23,13 @@
#define ULTIMA8_CONF_CONFIGFILEMANAGER_H
#include "common/formats/ini-file.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
namespace Ultima {
namespace Ultima8 {
-typedef Common::HashMap<Std::string, Std::string, Common::IgnoreCase_Hash> KeyMap;
+typedef Common::HashMap<Common::String, Common::String, Common::IgnoreCase_Hash> KeyMap;
class ConfigFileManager {
public:
@@ -37,7 +37,7 @@ public:
~ConfigFileManager();
struct ConfigFile {
- Std::string _category;
+ Common::String _category;
Common::INIFile _iniFile;
};
@@ -50,30 +50,30 @@ public:
//! \param root The name of the root node in the file
//! \param readonly If true, don't write to this file's tree (or the file)
//! \return true if successful
- bool readConfigFile(const Common::Path &fname, const Std::string &category);
+ bool readConfigFile(const Common::Path &fname, const Common::String &category);
//! clear everything
void clear();
//! clear everything in a root
- void clearRoot(const Std::string &category);
+ void clearRoot(const Common::String &category);
//! get value
- bool get(const Std::string &category, const Std::string §ion, const Std::string &key, Std::string &ret) const;
+ bool get(const Common::String &category, const Common::String §ion, const Common::String &key, Common::String &ret) const;
//! get value
- bool get(const Std::string &category, const Std::string §ion, const Std::string &key, int &ret) const;
+ bool get(const Common::String &category, const Common::String §ion, const Common::String &key, int &ret) const;
//! get value
- bool get(const Std::string &category, const Std::string §ion, const Std::string &key, bool &ret) const;
+ bool get(const Common::String &category, const Common::String §ion, const Common::String &key, bool &ret) const;
//! list all sections
//! \param category The config category to list all sections in
//! \return the sections. They have no guaranteed order.
- Std::vector<Std::string> listSections(const Std::string &category) const;
+ Std::vector<Common::String> listSections(const Common::String &category) const;
//! list all key-value pairs in the given section.
//! \param category The config category for the section to list
//! \param section The section to list
//! \return the key-value pairs. They have no guaranteed order.
- KeyMap listKeyValues(const Std::string &category, const Std::string §ion) const;
+ KeyMap listKeyValues(const Common::String &category, const Common::String §ion) const;
private:
Std::vector<ConfigFile *> _configFiles;
diff --git a/engines/ultima/ultima8/filesys/savegame.cpp b/engines/ultima/ultima8/filesys/savegame.cpp
index 3da16b4b1f3..a58949ddac4 100644
--- a/engines/ultima/ultima8/filesys/savegame.cpp
+++ b/engines/ultima/ultima8/filesys/savegame.cpp
@@ -207,7 +207,7 @@ bool SavegameWriter::finish() {
return true;
}
-bool SavegameWriter::writeFile(const Std::string &name, const uint8 *data, uint32 size) {
+bool SavegameWriter::writeFile(const Common::String &name, const uint8 *data, uint32 size) {
assert(name.size() <= 11);
_index.push_back(FileEntry());
@@ -219,7 +219,7 @@ bool SavegameWriter::writeFile(const Std::string &name, const uint8 *data, uint3
return true;
}
-bool SavegameWriter::writeFile(const Std::string &name, Common::MemoryWriteStreamDynamic *buf) {
+bool SavegameWriter::writeFile(const Common::String &name, Common::MemoryWriteStreamDynamic *buf) {
return writeFile(name, buf->getData(), buf->pos());
}
diff --git a/engines/ultima/ultima8/filesys/savegame.h b/engines/ultima/ultima8/filesys/savegame.h
index 94601cd859d..c2028993eef 100644
--- a/engines/ultima/ultima8/filesys/savegame.h
+++ b/engines/ultima/ultima8/filesys/savegame.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_FILESYS_SAVEGAME_H
#define ULTIMA8_FILESYS_SAVEGAME_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "common/hashmap.h"
#include "common/stream.h"
#include "common/memstream.h"
@@ -48,7 +48,7 @@ public:
uint32 getVersion() const { return _version; }
- Std::string getDescription() const { return _header.description; }
+ Common::String getDescription() const { return _header.description; }
/**
* Get an entry/section within the save
@@ -59,7 +59,7 @@ public:
class SavegameWriter {
class FileEntry : public Common::Array<byte> {
public:
- Std::string _name;
+ Common::String _name;
FileEntry() : Common::Array<byte>() {}
};
private:
@@ -73,12 +73,12 @@ public:
//! \param name name of the file
//! \param data the data
//! \param size (in bytes) of data
- bool writeFile(const Std::string &name, const uint8 *data, uint32 size);
+ bool writeFile(const Common::String &name, const uint8 *data, uint32 size);
//! write a file to the savegame from a memory stream
//! \param name name of the file
//! \param buf the MemoryWriteStreamDynamic to save
- bool writeFile(const Std::string &name, Common::MemoryWriteStreamDynamic *buf);
+ bool writeFile(const Common::String &name, Common::MemoryWriteStreamDynamic *buf);
//! finish savegame
bool finish();
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.h b/engines/ultima/ultima8/filesys/u8_save_file.h
index 5e38adabdd9..153338874f6 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.h
+++ b/engines/ultima/ultima8/filesys/u8_save_file.h
@@ -25,7 +25,7 @@
#include "common/archive.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 8245ded9bab..709cd0e383c 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -177,10 +177,10 @@ void GameData::loadTranslation() {
}
}
-Std::string GameData::translate(const Std::string &text) {
+Common::String GameData::translate(const Common::String &text) {
// TODO: maybe cache these lookups? config calls may be expensive
ConfigFileManager *config = ConfigFileManager::get_instance();
- Std::string trans;
+ Common::String trans;
if (config->get("language", "text", text, trans)) {
return trans;
}
@@ -193,8 +193,8 @@ FrameID GameData::translate(FrameID f) {
// TODO: allow translations to be in another shapeflex
ConfigFileManager *config = ConfigFileManager::get_instance();
- Std::string category = "language";
- Std::string section;
+ Common::String category = "language";
+ Common::String section;
switch (f._flexId) {
case GUMPS:
@@ -207,8 +207,8 @@ FrameID GameData::translate(FrameID f) {
char buf[100];
Common::sprintf_s(buf, "%d,%d", f._shapeNum, f._frameNum);
- Std::string key = buf;
- Std::string trans;
+ Common::String key = buf;
+ Common::String trans;
if (!config->get(category, section, key, trans)) {
return f;
}
@@ -235,7 +235,7 @@ void GameData::loadU8Data() {
if (!langletter)
error("Unknown language. Unable to open usecode");
- Std::string filename = "usecode/";
+ Common::String filename = "usecode/";
filename += langletter;
filename += "usecode.flx";
@@ -373,9 +373,9 @@ void GameData::setupJPOverrides() {
jpkeyvals = config->listKeyValues("language", "jpfonts");
for (const auto &i : jpkeyvals) {
int fontnum = atoi(i._key.c_str());
- const Std::string &fontdesc = i._value;
+ const Common::String &fontdesc = i._value;
- Std::vector<Std::string> vals;
+ Std::vector<Common::String> vals;
SplitString(fontdesc, ',', vals);
if (vals.size() != 2) {
warning("Invalid jpfont override: %s", fontdesc.c_str());
@@ -404,9 +404,9 @@ void GameData::setupTTFOverrides(const char *category, bool SJIS) {
ttfkeyvals = config->listKeyValues(category, "fontoverride");
for (const auto &i : ttfkeyvals) {
int fontnum = atoi(i._key.c_str());
- const Std::string &fontdesc = i._value;
+ const Common::String &fontdesc = i._value;
- Std::vector<Std::string> vals;
+ Std::vector<Common::String> vals;
SplitString(fontdesc, ',', vals);
if (vals.size() != 4) {
warning("Invalid ttf override: %s", fontdesc.c_str());
@@ -498,7 +498,7 @@ void GameData::loadRemorseData() {
if (!langletter)
error("Unknown language. Unable to open usecode");
- Std::string filename = "usecode/";
+ Common::String filename = "usecode/";
filename += langletter;
filename += "usecode.flx";
diff --git a/engines/ultima/ultima8/games/game_data.h b/engines/ultima/ultima8/games/game_data.h
index b119d11c81e..e5affa22c96 100644
--- a/engines/ultima/ultima8/games/game_data.h
+++ b/engines/ultima/ultima8/games/game_data.h
@@ -23,7 +23,7 @@
#define ULTIMA8_GAMES_GAMEDATA_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gfx/frame_id.h"
namespace Ultima {
@@ -104,7 +104,7 @@ public:
const WeaselDat *getWeaselDat(uint16 level) const;
- Std::string translate(const Std::string &text);
+ Common::String translate(const Common::String &text);
FrameID translate(FrameID frame);
enum ShapeFlexId {
diff --git a/engines/ultima/ultima8/games/game_info.cpp b/engines/ultima/ultima8/games/game_info.cpp
index e4f571a96be..ce2cbb36ee0 100644
--- a/engines/ultima/ultima8/games/game_info.cpp
+++ b/engines/ultima/ultima8/games/game_info.cpp
@@ -97,35 +97,35 @@ char GameInfo::getLanguageUsecodeLetter() const {
}
}
-Std::string GameInfo::getLanguage() const {
+Common::String GameInfo::getLanguage() const {
unsigned int l = static_cast<unsigned int>(_language);
assert(l < (sizeof(gamelangs) / sizeof(gamelangs[0])) - 1);
return gamelangs[l].name;
}
-Std::string GameInfo::getGameTitle() const {
+Common::String GameInfo::getGameTitle() const {
unsigned int t = static_cast<unsigned int>(_type);
assert(t < (sizeof(gametypes) / sizeof(gametypes[0])) - 1);
return gametypes[t].longname;
}
-Std::string GameInfo::getPrintableVersion() const {
+Common::String GameInfo::getPrintableVersion() const {
char buf[32];
Common::sprintf_s(buf, "%d.%02d", version / 100, version % 100);
return buf;
}
-Std::string GameInfo::getPrintDetails() const {
- Std::string ret;
+Common::String GameInfo::getPrintDetails() const {
+ Common::String ret;
- Std::string title = getGameTitle();
+ Common::String title = getGameTitle();
if (title == "") title = "Unknown";
ret = title + ", ";
- Std::string lang = getLanguage();
+ Common::String lang = getLanguage();
if (lang == "") lang = "Unknown";
ret += lang;
@@ -138,8 +138,8 @@ Std::string GameInfo::getPrintDetails() const {
}
-Std::string GameInfo::getPrintableMD5() const {
- Std::string ret;
+Common::String GameInfo::getPrintableMD5() const {
+ Common::String ret;
char buf[33];
for (int i = 0; i < 16; ++i) {
@@ -167,21 +167,21 @@ void GameInfo::save(Common::WriteStream *ws) {
unsigned int t = static_cast<unsigned int>(_type);
assert(t < (sizeof(gametypes) / sizeof(gametypes[0])) - 1);
- Std::string game = gametypes[t].shortname;
- Std::string lang = gamelangs[l].name;
+ Common::String game = gametypes[t].shortname;
+ Common::String lang = gamelangs[l].name;
char buf[16];
Common::sprintf_s(buf, "%d", version);
- Std::string ver = buf;
- Std::string md5Str = getPrintableMD5();
+ Common::String ver = buf;
+ Common::String md5Str = getPrintableMD5();
- Std::string d = game + "," + lang + "," + ver + "," + md5Str + "\n";
+ Common::String d = game + "," + lang + "," + ver + "," + md5Str + "\n";
ws->write(d.c_str(), d.size());
}
bool GameInfo::load(Common::SeekableReadStream *rs, uint32 ver) {
- Std::string s;
- Std::vector<Std::string> parts;
+ Common::String s;
+ Std::vector<Common::String> parts;
s = rs->readLine();
SplitString(s, ',', parts);
diff --git a/engines/ultima/ultima8/games/game_info.h b/engines/ultima/ultima8/games/game_info.h
index d883521d42f..f24a7ed9662 100644
--- a/engines/ultima/ultima8/games/game_info.h
+++ b/engines/ultima/ultima8/games/game_info.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GAMES_GAMEINFO_H
#define ULTIMA8_GAMES_GAMEINFO_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
@@ -33,7 +33,7 @@ class IDataSource;
struct GameInfo {
GameInfo();
- Std::string _name;
+ Common::String _name;
enum GameType {
GAME_UNKNOWN = 0,
@@ -71,12 +71,12 @@ struct GameInfo {
char getLanguageFileLetter() const;
char getLanguageUsecodeLetter() const;
- Std::string getLanguage() const;
- Std::string getGameTitle() const;
- Std::string getPrintableVersion() const;
+ Common::String getLanguage() const;
+ Common::String getGameTitle() const;
+ Common::String getPrintableVersion() const;
- Std::string getPrintDetails() const;
- Std::string getPrintableMD5() const;
+ Common::String getPrintDetails() const;
+ Common::String getPrintableMD5() const;
bool match(GameInfo &other, bool ignoreMD5 = false) const;
diff --git a/engines/ultima/ultima8/games/treasure_loader.cpp b/engines/ultima/ultima8/games/treasure_loader.cpp
index 826a2497ebb..c516bec9c46 100644
--- a/engines/ultima/ultima8/games/treasure_loader.cpp
+++ b/engines/ultima/ultima8/games/treasure_loader.cpp
@@ -51,11 +51,11 @@ void TreasureLoader::loadDefaults() {
}
}
-bool TreasureLoader::parse(const Std::string &desc,
+bool TreasureLoader::parse(const Common::String &desc,
Std::vector<TreasureInfo> &treasure) const {
treasure.clear();
- Std::vector<Std::string> tr;
+ Std::vector<Common::String> tr;
SplitString(desc, ';', tr);
TreasureInfo ti;
@@ -70,17 +70,17 @@ bool TreasureLoader::parse(const Std::string &desc,
return true;
}
-bool TreasureLoader::internalParse(const Std::string &desc, TreasureInfo &ti,
+bool TreasureLoader::internalParse(const Common::String &desc, TreasureInfo &ti,
bool loadingDefault) const {
ti.clear();
bool loadedDefault = false;
- Std::vector<Common::Pair<Std::string, Std::string> > kv;
+ Std::vector<Common::Pair<Common::String, Common::String> > kv;
SplitStringKV(desc, ' ', kv);
for (unsigned int i = 0; i < kv.size(); ++i) {
- const Std::string &key = kv[i].first;
- Std::string val = kv[i].second;
+ const Common::String &key = kv[i].first;
+ Common::String val = kv[i].second;
if (key == "shape") {
if (!parseUInt32Vector(val, ti._shapes)) {
@@ -162,20 +162,20 @@ bool TreasureLoader::internalParse(const Std::string &desc, TreasureInfo &ti,
return true;
}
-bool TreasureLoader::parseUInt32Vector(const Std::string &val_,
+bool TreasureLoader::parseUInt32Vector(const Common::String &val_,
Std::vector<uint32> &vec) const {
- Std::string val = val_;
+ Common::String val = val_;
vec.clear();
if (val.empty())
return false;
while (!val.empty()) {
- Std::string::size_type pos = val.find(',');
- const Std::string item = val.substr(0, pos);
+ Common::String::size_type pos = val.find(',');
+ const Common::String item = val.substr(0, pos);
- Std::string::size_type itempos = val.find('-');
- if (itempos != Std::string::npos) {
+ Common::String::size_type itempos = val.find('-');
+ if (itempos != Common::String::npos) {
unsigned int min, max;
if (!parseUIntRange(item, min, max))
return false;
@@ -188,17 +188,17 @@ bool TreasureLoader::parseUInt32Vector(const Std::string &val_,
vec.push_back(x);
}
- if (pos != Std::string::npos) pos++;
+ if (pos != Common::String::npos) pos++;
val.erase(0, pos);
}
return true;
}
-bool TreasureLoader::parseUIntRange(const Std::string &val,
+bool TreasureLoader::parseUIntRange(const Common::String &val,
unsigned int &min, unsigned int &max) const {
- Std::string::size_type pos = val.find('-');
- if (pos == 0 || pos == Std::string::npos || pos + 1 >= val.size())
+ Common::String::size_type pos = val.find('-');
+ if (pos == 0 || pos == Common::String::npos || pos + 1 >= val.size())
return false;
int t1 = 0;
int t2 = 0;
@@ -213,7 +213,7 @@ bool TreasureLoader::parseUIntRange(const Std::string &val,
return ok;
}
-bool TreasureLoader::parseDouble(const Std::string &val, double &d) const {
+bool TreasureLoader::parseDouble(const Common::String &val, double &d) const {
if (val.empty())
return false;
// TODO: error checking
@@ -221,7 +221,7 @@ bool TreasureLoader::parseDouble(const Std::string &val, double &d) const {
return true;
}
-bool TreasureLoader::parseInt(const Std::string &val, int &i) const {
+bool TreasureLoader::parseInt(const Common::String &val, int &i) const {
if (val.empty())
return false;
// TODO: error checking
diff --git a/engines/ultima/ultima8/games/treasure_loader.h b/engines/ultima/ultima8/games/treasure_loader.h
index 1ab2871c346..c26f085e4fb 100644
--- a/engines/ultima/ultima8/games/treasure_loader.h
+++ b/engines/ultima/ultima8/games/treasure_loader.h
@@ -28,7 +28,7 @@
namespace Ultima {
namespace Ultima8 {
-typedef Common::HashMap<Std::string, TreasureInfo, Common::IgnoreCase_Hash> TreasureMap;
+typedef Common::HashMap<Common::String, TreasureInfo, Common::IgnoreCase_Hash> TreasureMap;
class TreasureLoader {
public:
@@ -39,17 +39,17 @@ public:
void loadDefaults();
//! parse treasure string into vector of TreasureInfo objects
- bool parse(const Std::string &, Std::vector<TreasureInfo> &treasure) const;
+ bool parse(const Common::String &, Std::vector<TreasureInfo> &treasure) const;
private:
TreasureMap _defaultTreasure;
- bool internalParse(const Std::string &desc, TreasureInfo &ti, bool loadingDefault) const;
+ bool internalParse(const Common::String &desc, TreasureInfo &ti, bool loadingDefault) const;
- bool parseUInt32Vector(const Std::string &val, Std::vector<uint32> &vec) const;
- bool parseUIntRange(const Std::string &val, unsigned int &min, unsigned int &max) const;
- bool parseDouble(const Std::string &val, double &d) const;
- bool parseInt(const Std::string &val, int &i) const;
+ bool parseUInt32Vector(const Common::String &val, Std::vector<uint32> &vec) const;
+ bool parseUIntRange(const Common::String &val, unsigned int &min, unsigned int &max) const;
+ bool parseDouble(const Common::String &val, double &d) const;
+ bool parseInt(const Common::String &val, int &i) const;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/games/u8_game.cpp b/engines/ultima/ultima8/games/u8_game.cpp
index fcf43b88a29..ed2772412a1 100644
--- a/engines/ultima/ultima8/games/u8_game.cpp
+++ b/engines/ultima/ultima8/games/u8_game.cpp
@@ -214,7 +214,7 @@ void U8Game::playCredits() {
delete rs;
return;
}
- Std::string text = getCreditText(rs);
+ Common::String text = getCreditText(rs);
delete rs;
MusicProcess *musicproc = MusicProcess::get_instance();
@@ -235,7 +235,7 @@ void U8Game::playQuotes() {
delete rs;
return;
}
- const Std::string text = getCreditText(rs);
+ const Common::String text = getCreditText(rs);
delete rs;
MusicProcess *musicproc = MusicProcess::get_instance();
@@ -250,7 +250,7 @@ void U8Game::playQuotes() {
void U8Game::writeSaveInfo(Common::WriteStream *ws) {
MainActor *av = getMainActor();
- const Std::string &avname = av->getName();
+ const Common::String &avname = av->getName();
const uint8 namelength = static_cast<uint8>(avname.size());
ws->writeByte(namelength);
for (unsigned int i = 0; i < namelength; ++i)
@@ -285,9 +285,9 @@ void U8Game::writeSaveInfo(Common::WriteStream *ws) {
}
}
-Std::string U8Game::getCreditText(Common::SeekableReadStream *rs) {
+Common::String U8Game::getCreditText(Common::SeekableReadStream *rs) {
unsigned int size = rs->size();
- Std::string text(size, ' ');
+ Common::String text(size, ' ');
for (unsigned int i = 0; i < size; ++i) {
uint8 c = rs->readByte();
int x;
diff --git a/engines/ultima/ultima8/games/u8_game.h b/engines/ultima/ultima8/games/u8_game.h
index 28cf3c4c464..2ff13c1ee5e 100644
--- a/engines/ultima/ultima8/games/u8_game.h
+++ b/engines/ultima/ultima8/games/u8_game.h
@@ -51,7 +51,7 @@ public:
void playDemoScreen() override { }; // no demo for U8
protected:
- Std::string getCreditText(Common::SeekableReadStream *rs);
+ Common::String getCreditText(Common::SeekableReadStream *rs);
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gfx/fonts/font.cpp b/engines/ultima/ultima8/gfx/fonts/font.cpp
index a18e810ad4b..34ad96c904e 100644
--- a/engines/ultima/ultima8/gfx/fonts/font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font.cpp
@@ -35,7 +35,7 @@ Font::~Font() {
}
-void Font::getTextSize(const Std::string &text,
+void Font::getTextSize(const Common::String &text,
int32 &resultwidth, int32 &resultheight,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
@@ -48,7 +48,7 @@ void Font::getTextSize(const Std::string &text,
//static
-bool Font::Traits::canBreakAfter(Std::string::const_iterator &i) {
+bool Font::Traits::canBreakAfter(Common::String::const_iterator &i) {
// It's not really relevant what we do here, because this probably will
// not be used at normal font sizes.
return true;
@@ -56,8 +56,8 @@ bool Font::Traits::canBreakAfter(Std::string::const_iterator &i) {
//static
-bool Font::SJISTraits::canBreakAfter(Std::string::const_iterator &i) {
- Std::string::const_iterator j = i;
+bool Font::SJISTraits::canBreakAfter(Common::String::const_iterator &i) {
+ Common::String::const_iterator j = i;
uint32 u1 = unicode(j);
// See: https://wiki.wesnoth.org/index.php?title=JapaneseTranslation&oldid=23480#Word-Wrapping
@@ -145,8 +145,8 @@ bool Font::SJISTraits::canBreakAfter(Std::string::const_iterator &i) {
}
template<class T>
-static void findWordEnd(const Std::string &text,
- Std::string::const_iterator &iter, bool u8specials) {
+static void findWordEnd(const Common::String &text,
+ Common::String::const_iterator &iter, bool u8specials) {
while (iter != text.end()) {
if (T::isSpace(iter, u8specials)) return;
T::advance(iter);
@@ -154,8 +154,8 @@ static void findWordEnd(const Std::string &text,
}
template<class T>
-static void passSpace(const Std::string &text,
- Std::string::const_iterator &iter, bool u8specials) {
+static void passSpace(const Common::String &text,
+ Common::String::const_iterator &iter, bool u8specials) {
while (iter != text.end()) {
if (!T::isSpace(iter, u8specials)) return;
T::advance(iter);
@@ -179,16 +179,16 @@ CHECKME: any others? (page breaks for books?)
template<class T>
Std::list<PositionedText> typesetText(Font *font,
- const Std::string &text, unsigned int &remaining, int32 width, int32 height,
+ const Common::String &text, unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, bool pagebreaks, int32 &resultwidth,
- int32 &resultheight, Std::string::size_type cursor) {
+ int32 &resultheight, Common::String::size_type cursor) {
debugC(kDebugGraphics, "typeset (%d, %d) %s", width, height, text.c_str());
// be optimistic and assume everything will fit
remaining = text.size();
- Std::string curline;
+ Common::String curline;
int totalwidth = 0;
int totalheight = 0;
@@ -196,10 +196,10 @@ Std::list<PositionedText> typesetText(Font *font,
Std::list<PositionedText> lines;
PositionedText line;
- Std::string::const_iterator iter = text.begin();
- Std::string::const_iterator cursoriter = text.begin();
- if (cursor != Std::string::npos) cursoriter += cursor;
- Std::string::const_iterator curlinestart = text.begin();
+ Common::String::const_iterator iter = text.begin();
+ Common::String::const_iterator cursoriter = text.begin();
+ if (cursor != Common::String::npos) cursoriter += cursor;
+ Common::String::const_iterator curlinestart = text.begin();
bool breakhere = false;
while (true) {
@@ -213,8 +213,8 @@ Std::list<PositionedText> typesetText(Font *font,
line._dims.setWidth(stringwidth);
line._dims.setHeight(stringheight);
line._text = curline;
- line._cursor = Std::string::npos;
- if (cursor != Std::string::npos && cursoriter >= curlinestart &&
+ line._cursor = Common::String::npos;
+ if (cursor != Common::String::npos && cursoriter >= curlinestart &&
(cursoriter < iter || (!breakhere && cursoriter == iter))) {
line._cursor = cursoriter - curlinestart;
if (line._dims.width() == 0) {
@@ -249,12 +249,12 @@ Std::list<PositionedText> typesetText(Font *font,
} else {
// see if next word still fits on the current line
- Std::string::const_iterator nextword = iter;
+ Common::String::const_iterator nextword = iter;
passSpace<T>(text, nextword, u8specials);
// process spaces
bool foundLF = false;
- Std::string spaces;
+ Common::String spaces;
for (; iter < nextword; T::advance(iter)) {
if (T::isBreak(iter, u8specials)) {
foundLF = true;
@@ -271,10 +271,10 @@ Std::list<PositionedText> typesetText(Font *font,
if (foundLF || nextword == text.end()) continue;
// process word
- Std::string::const_iterator endofnextword = iter;
+ Common::String::const_iterator endofnextword = iter;
findWordEnd<T>(text, endofnextword, u8specials);
int32 stringwidth = 0, stringheight = 0;
- Std::string newline = curline + spaces +
+ Common::String newline = curline + spaces +
text.substr(nextword - text.begin(), endofnextword - nextword);
font->getStringSize(newline, stringwidth, stringheight);
@@ -287,9 +287,9 @@ Std::list<PositionedText> typesetText(Font *font,
// FIXME: this is rather inefficient; binary search?
// FIXME: clean up...
iter = nextword;
- Std::string::const_iterator saveiter = nextword; // Dummy initialization
- Std::string::const_iterator saveiter_fail;
- Std::string curline_fail;
+ Common::String::const_iterator saveiter = nextword; // Dummy initialization
+ Common::String::const_iterator saveiter_fail;
+ Common::String curline_fail;
newline = spaces;
bool breakok = true;
int breakcount = -1;
@@ -367,17 +367,17 @@ Std::list<PositionedText> typesetText(Font *font,
// explicit instantiations
template
Std::list<PositionedText> typesetText<Font::Traits>
-(Font *font, const Std::string &text,
+(Font *font, const Common::String &text,
unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, bool pagebreaks,
- int32 &resultwidth, int32 &resultheight, Std::string::size_type cursor);
+ int32 &resultwidth, int32 &resultheight, Common::String::size_type cursor);
template
Std::list<PositionedText> typesetText<Font::SJISTraits>
-(Font *font, const Std::string &text,
+(Font *font, const Common::String &text,
unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, bool pagebreaks,
- int32 &resultwidth, int32 &resultheight, Std::string::size_type cursor);
+ int32 &resultwidth, int32 &resultheight, Common::String::size_type cursor);
} // End of namespace Ultima8
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/gfx/fonts/font.h b/engines/ultima/ultima8/gfx/fonts/font.h
index bd39901a42f..186ed531068 100644
--- a/engines/ultima/ultima8/gfx/fonts/font.h
+++ b/engines/ultima/ultima8/gfx/fonts/font.h
@@ -25,7 +25,7 @@
#include "common/rect.h"
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/misc/encoding.h"
namespace Ultima {
@@ -34,9 +34,9 @@ namespace Ultima8 {
class RenderedText;
struct PositionedText {
- Std::string _text;
+ Common::String _text;
Common::Rect32 _dims;
- Std::string::size_type _cursor;
+ Common::String::size_type _cursor;
};
class Font {
@@ -63,7 +63,7 @@ public:
//! \param text The string
//! \param width Returns the width
//! \param height Returns the height
- virtual void getStringSize(const Std::string &text,
+ virtual void getStringSize(const Common::String &text,
int32 &width, int32 &height) = 0;
//! render a string
@@ -75,11 +75,11 @@ public:
//! \param u8specials If true, interpret the special characters U8 uses
//! \param pagebreaks If true (and u8specials too), stop at U8 pagebreaks
//! \return the rendered text in a RenderedText object
- virtual RenderedText *renderText(const Std::string &text,
+ virtual RenderedText *renderText(const Common::String &text,
unsigned int &remaining, int32 width = 0, int32 height = 0,
TextAlign align = TEXT_LEFT, bool u8specials = false,
bool pagebreaks = false,
- Std::string::size_type cursor = Std::string::npos) = 0;
+ Common::String::size_type cursor = Common::String::npos) = 0;
//! get the dimensions of a rendered string
//! \param text The text
@@ -91,7 +91,7 @@ public:
//! \param align Alignment of the text (left, right, center)
//! \param u8specials If true, interpret the special characters U8 uses
//! \param pagebreaks If true (and u8specials too), stop at U8 pagebreaks
- virtual void getTextSize(const Std::string &text,
+ virtual void getTextSize(const Common::String &text,
int32 &resultwidth, int32 &resultheight, unsigned int &remaining,
int32 width = 0, int32 height = 0, TextAlign align = TEXT_LEFT,
bool u8specials = false, bool pagebreaks = false);
@@ -107,54 +107,54 @@ protected:
bool _highRes;
struct Traits {
- static bool isSpace(Std::string::const_iterator &i, bool u8specials) {
+ static bool isSpace(Common::String::const_iterator &i, bool u8specials) {
char c = *i;
return (c == ' ' || c == '\t' || c == '\n' || c == '\r' ||
(u8specials && (c == '%' || c == '~' || c == '*' || c == '^')));
}
- static bool isTab(Std::string::const_iterator &i, bool u8specials) {
+ static bool isTab(Common::String::const_iterator &i, bool u8specials) {
char c = *i;
return (c == '\t' ||
(u8specials && (c == '\t' || c == '%')));
}
- static bool isBreak(Std::string::const_iterator &i, bool u8specials) {
+ static bool isBreak(Common::String::const_iterator &i, bool u8specials) {
char c = *i;
return (c == '\n' ||
(u8specials && (c == '\n' || c == '~' || c == '*')));
}
- static bool isPageBreak(Std::string::const_iterator &i, bool u8specials) {
+ static bool isPageBreak(Common::String::const_iterator &i, bool u8specials) {
char c = *i;
return (u8specials && c == '*');
}
- static bool canBreakAfter(Std::string::const_iterator &i);
- static void advance(Std::string::const_iterator &i) {
+ static bool canBreakAfter(Common::String::const_iterator &i);
+ static void advance(Common::String::const_iterator &i) {
++i;
}
- static Std::string::size_type length(const Std::string &t) {
+ static Common::String::size_type length(const Common::String &t) {
return t.size();
}
- static uint32 unicode(Std::string::const_iterator &i) {
+ static uint32 unicode(Common::String::const_iterator &i) {
return encoding[static_cast<uint8>(*i++)];
}
};
struct SJISTraits : public Traits {
- static bool canBreakAfter(Std::string::const_iterator &i);
- static void advance(Std::string::const_iterator &i) {
+ static bool canBreakAfter(Common::String::const_iterator &i);
+ static void advance(Common::String::const_iterator &i) {
// FIXME: this can advance past the end of a malformed string
uint8 c = *i;
i++;
if (c >= 0x80) i++;
}
- static Std::string::size_type length(const Std::string &t) {
- Std::string::size_type l = 0;
- Std::string::const_iterator iter = t.begin();
+ static Common::String::size_type length(const Common::String &t) {
+ Common::String::size_type l = 0;
+ Common::String::const_iterator iter = t.begin();
while (iter != t.end()) {
advance(iter);
l++;
}
return l;
}
- static uint32 unicode(Std::string::const_iterator &i) {
+ static uint32 unicode(Common::String::const_iterator &i) {
uint16 s = static_cast<uint8>(*i);
i++;
if (s >= 0x80) {
@@ -168,11 +168,11 @@ protected:
template<class T>
Std::list<PositionedText> typesetText(Font *font,
- const Std::string &text, unsigned int &remaining,
+ const Common::String &text, unsigned int &remaining,
int32 width, int32 height, Font::TextAlign align,
bool u8specials, bool pagebreaks,
int32 &resultwidth, int32 &resultheight,
- Std::string::size_type cursor = Std::string::npos);
+ Common::String::size_type cursor = Common::String::npos);
} // End of namespace Ultima8
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/gfx/fonts/font_manager.h b/engines/ultima/ultima8/gfx/fonts/font_manager.h
index 2e87005a0ee..b521ae8cff9 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_manager.h
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.h
@@ -23,7 +23,7 @@
#define ULTIMA8_GFX_FONTS_FONTMANAGER_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "common/path.h"
#include "graphics/font.h"
diff --git a/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
index 99cd8152194..9899e926fa9 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
@@ -66,9 +66,9 @@ void FontShapeArchive::setHVLeads() {
KeyMap leadkeyvals = config->listKeyValues("game", "fontleads");
for (const auto &i : leadkeyvals) {
int fontnum = atoi(i._key.c_str());
- Std::string leaddesc = i._value;
+ Common::String leaddesc = i._value;
- Std::vector<Std::string> vals;
+ Std::vector<Common::String> vals;
SplitString(leaddesc, ',', vals);
if (vals.size() != 2) {
warning("Invalid hlead/vlead description: %s", leaddesc.c_str());
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_font.cpp b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
index 04b4552c21a..8879dafff79 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
@@ -55,7 +55,7 @@ int JPFont::getBaselineSkip() {
}
-void JPFont::getStringSize(const Std::string &text, int32 &width, int32 &height) {
+void JPFont::getStringSize(const Common::String &text, int32 &width, int32 &height) {
int hlead = _shapeFont->getHlead();
width = hlead;
height = getHeight();
@@ -74,7 +74,7 @@ void JPFont::getStringSize(const Std::string &text, int32 &width, int32 &height)
}
}
-void JPFont::getTextSize(const Std::string &text,
+void JPFont::getTextSize(const Common::String &text,
int32 &resultwidth, int32 &resultheight,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
@@ -85,11 +85,11 @@ void JPFont::getTextSize(const Std::string &text,
resultwidth, resultheight);
}
-RenderedText *JPFont::renderText(const Std::string &text,
+RenderedText *JPFont::renderText(const Common::String &text,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
bool u8specials, bool pagebreaks,
- Std::string::size_type cursor) {
+ Common::String::size_type cursor) {
int32 resultwidth, resultheight;
Std::list<PositionedText> lines;
lines = typesetText<SJISTraits>(this, text, remaining,
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_font.h b/engines/ultima/ultima8/gfx/fonts/jp_font.h
index c0854a52315..bb80ece14ae 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_font.h
+++ b/engines/ultima/ultima8/gfx/fonts/jp_font.h
@@ -40,18 +40,18 @@ public:
int getBaseline() override;
int getBaselineSkip() override;
- void getStringSize(const Std::string &text,
+ void getStringSize(const Common::String &text,
int32 &width, int32 &height) override;
- void getTextSize(const Std::string &text, int32 &resultwidth,
+ void getTextSize(const Common::String &text, int32 &resultwidth,
int32 &resultheight, unsigned int &remaining, int32 width = 0,
int32 height = 0, TextAlign align = TEXT_LEFT,
bool u8specials = false, bool pagebreaks = false) override;
- RenderedText *renderText(const Std::string &text,
+ RenderedText *renderText(const Common::String &text,
unsigned int &remaining, int32 width = 0, int32 height = 0,
TextAlign align = TEXT_LEFT, bool u8specials = false,
bool pagebreaks = false,
- Std::string::size_type cursor = Std::string::npos) override;
+ Common::String::size_type cursor = Common::String::npos) override;
protected:
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_font.cpp b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
index 0e75802702c..5d9d618b8f3 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
@@ -79,7 +79,7 @@ int ShapeFont::getBaselineSkip() {
return getHeight() + getVlead();
}
-void ShapeFont::getStringSize(const Std::string &text, int32 &width, int32 &height) {
+void ShapeFont::getStringSize(const Common::String &text, int32 &width, int32 &height) {
width = _hLead;
height = getHeight();
@@ -118,11 +118,11 @@ int ShapeFont::charToFrameNum(char c) const {
}
}
-RenderedText *ShapeFont::renderText(const Std::string &text,
+RenderedText *ShapeFont::renderText(const Common::String &text,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
bool u8specials, bool pagebreaks,
- Std::string::size_type cursor) {
+ Common::String::size_type cursor) {
int32 resultwidth, resultheight;
Std::list<PositionedText> lines;
lines = typesetText<Traits>(this, text, remaining,
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_font.h b/engines/ultima/ultima8/gfx/fonts/shape_font.h
index bf569d1a831..644c3d4553e 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_font.h
+++ b/engines/ultima/ultima8/gfx/fonts/shape_font.h
@@ -61,14 +61,14 @@ public:
int charToFrameNum(char c) const;
- void getStringSize(const Std::string &text,
+ void getStringSize(const Common::String &text,
int32 &width, int32 &height) override;
- RenderedText *renderText(const Std::string &text,
+ RenderedText *renderText(const Common::String &text,
unsigned int &remaining, int32 width = 0, int32 height = 0,
TextAlign align = TEXT_LEFT, bool u8specials = false,
bool pagebreaks = false,
- Std::string::size_type cursor = Std::string::npos) override;
+ Common::String::size_type cursor = Common::String::npos) override;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gfx/fonts/tt_font.cpp b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
index 68db1883cde..66f88af9542 100644
--- a/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
@@ -74,11 +74,11 @@ int TTFont::getBaselineSkip() {
}
template<class T>
-static Common::U32String toUnicode(const Std::string &text, uint16 bullet) {
- Std::string::size_type len = T::length(text);
+static Common::U32String toUnicode(const Common::String &text, uint16 bullet) {
+ Common::String::size_type len = T::length(text);
Common::U32String result = Common::U32String(text.c_str(), len);
- Std::string::const_iterator iter = text.begin();
+ Common::String::const_iterator iter = text.begin();
for (uint idx = 0; idx < len; ++idx) {
uint32 u = T::unicode(iter);
if (u == '@') {
@@ -91,7 +91,7 @@ static Common::U32String toUnicode(const Std::string &text, uint16 bullet) {
return result;
}
-void TTFont::getStringSize(const Std::string &text, int32 &width, int32 &height) {
+void TTFont::getStringSize(const Common::String &text, int32 &width, int32 &height) {
// convert to unicode
Common::U32String unicodeText;
if (!_SJIS)
@@ -106,7 +106,7 @@ void TTFont::getStringSize(const Std::string &text, int32 &width, int32 &height)
height += 2 * _borderSize;
}
-void TTFont::getTextSize(const Std::string &text,
+void TTFont::getTextSize(const Common::String &text,
int32 &resultWidth, int32 &resultHeight,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
@@ -193,9 +193,9 @@ void TTFont::addTextBorder(Graphics::ManagedSurface &textSurf, uint32 *texBuf, c
}
}
-RenderedText *TTFont::renderText(const Std::string &text, unsigned int &remaining,
+RenderedText *TTFont::renderText(const Common::String &text, unsigned int &remaining,
int32 width, int32 height, TextAlign align, bool u8specials, bool pagebreaks,
- Std::string::size_type cursor) {
+ Common::String::size_type cursor) {
int32 resultWidth, resultHeight, lineHeight;
Std::list<PositionedText> lines;
if (!_SJIS)
@@ -277,7 +277,7 @@ RenderedText *TTFont::renderText(const Std::string &text, unsigned int &remainin
}
}
- if (line._cursor != Std::string::npos) {
+ if (line._cursor != Common::String::npos) {
assert(line._cursor <= line._text.size());
unicodeText = unicodeText.substr(0, line._cursor);
diff --git a/engines/ultima/ultima8/gfx/fonts/tt_font.h b/engines/ultima/ultima8/gfx/fonts/tt_font.h
index c8681182923..cdebf92ba26 100644
--- a/engines/ultima/ultima8/gfx/fonts/tt_font.h
+++ b/engines/ultima/ultima8/gfx/fonts/tt_font.h
@@ -43,19 +43,19 @@ public:
return _antiAliased;
}
- void getStringSize(const Std::string &text,
+ void getStringSize(const Common::String &text,
int32 &width, int32 &height) override;
- void getTextSize(const Std::string &text,
+ void getTextSize(const Common::String &text,
int32 &resultwidth, int32 &resultheight, unsigned int &remaining,
int32 width = 0, int32 height = 0, TextAlign align = TEXT_LEFT,
bool u8specials = false, bool pagebreaks = false) override;
- RenderedText *renderText(const Std::string &text,
+ RenderedText *renderText(const Common::String &text,
unsigned int &remaining, int32 width = 0, int32 height = 0,
TextAlign align = TEXT_LEFT, bool u8specials = false,
bool pagebreaks = false,
- Std::string::size_type cursor = Std::string::npos) override;
+ Common::String::size_type cursor = Common::String::npos) override;
protected:
Graphics::Font *_ttfFont;
diff --git a/engines/ultima/ultima8/gfx/skf_player.cpp b/engines/ultima/ultima8/gfx/skf_player.cpp
index 8a0d8e58713..1e8f122bfa1 100644
--- a/engines/ultima/ultima8/gfx/skf_player.cpp
+++ b/engines/ultima/ultima8/gfx/skf_player.cpp
@@ -252,7 +252,7 @@ void SKFPlayer::run() {
_skf->get_object(_events[_curEvent]->_data - 1));
uint32 textsize = _skf->get_size(_events[_curEvent]->_data - 1);
if (subtitles && textsize > 7) {
- Std::string subtitle = (textbuf + 6);
+ Common::String subtitle = (textbuf + 6);
delete _subs;
_subtitleY = textbuf[4] + (textbuf[5] << 8);
unsigned int remaining;
diff --git a/engines/ultima/ultima8/gfx/type_flags.cpp b/engines/ultima/ultima8/gfx/type_flags.cpp
index e0d2ccf9db1..69a5c22316d 100644
--- a/engines/ultima/ultima8/gfx/type_flags.cpp
+++ b/engines/ultima/ultima8/gfx/type_flags.cpp
@@ -181,8 +181,8 @@ void TypeFlags::loadWeaponInfo() {
ConfigFileManager *config = ConfigFileManager::get_instance();
// load weapons
- Std::vector<Std::string> weaponkeys;
- Std::string category = "weapons";
+ Std::vector<Common::String> weaponkeys;
+ Common::String category = "weapons";
weaponkeys = config->listSections(category);
for (const auto §ion : weaponkeys) {
WeaponInfo *wi = new WeaponInfo;
@@ -301,8 +301,8 @@ void TypeFlags::loadArmourInfo() {
MainShapeArchive *msf = GameData::get_instance()->getMainShapes();
// load armour
- Std::vector<Std::string> armourkeys;
- Std::string category = "armour";
+ Std::vector<Common::String> armourkeys;
+ Common::String category = "armour";
armourkeys = config->listSections(category);
for (const auto §ion : armourkeys) {
ArmourInfo ai;
@@ -357,8 +357,8 @@ void TypeFlags::loadMonsterInfo() {
treasureLoader.loadDefaults();
// load monsters
- Std::vector<Std::string> monsterkeys;
- Std::string category = "monsters";
+ Std::vector<Common::String> monsterkeys;
+ Common::String category = "monsters";
monsterkeys = config->listSections(category);
for (const auto §ion : monsterkeys) {
MonsterInfo *mi = new MonsterInfo;
@@ -421,7 +421,7 @@ void TypeFlags::loadMonsterInfo() {
else
mi->_explode = 0;
- Std::string treasure;
+ Common::String treasure;
if (config->get(category, section, "treasure", treasure)) {
bool ok = treasureLoader.parse(treasure, mi->_treasure);
if (!ok) {
diff --git a/engines/ultima/ultima8/gumps/ask_gump.cpp b/engines/ultima/ultima8/gumps/ask_gump.cpp
index 6e0cbe19ff3..60fc58874f7 100644
--- a/engines/ultima/ultima8/gumps/ask_gump.cpp
+++ b/engines/ultima/ultima8/gumps/ask_gump.cpp
@@ -57,7 +57,7 @@ void AskGump::InitGump(Gump *newparent, bool take_focus) {
ItemRelativeGump::InitGump(newparent, take_focus);
for (unsigned int i = 0; i < _answers->getSize(); ++i) {
- Std::string str_answer = "@ ";
+ Common::String str_answer = "@ ";
str_answer += UCMachine::get_instance()->getString(_answers->getStringIndex(i));
ButtonWidget *child = new ButtonWidget(px, py, str_answer,
diff --git a/engines/ultima/ultima8/gumps/bark_gump.cpp b/engines/ultima/ultima8/gumps/bark_gump.cpp
index 72b67fa8045..6bfd1ef7c4c 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.cpp
+++ b/engines/ultima/ultima8/gumps/bark_gump.cpp
@@ -46,7 +46,7 @@ BarkGump::BarkGump() : ItemRelativeGump(), _counter(0), _textWidget(0),
_talkSpeed = ConfMan.getInt("talkspeed");
}
-BarkGump::BarkGump(uint16 owner, const Std::string &msg, uint32 speechShapeNum) :
+BarkGump::BarkGump(uint16 owner, const Common::String &msg, uint32 speechShapeNum) :
ItemRelativeGump(0, 0, 100, 100, owner, FLAG_KEEP_VISIBLE, LAYER_ABOVE_NORMAL),
_barked(msg), _counter(100), _speechShapeNum(speechShapeNum),
_speechLength(0), _textWidget(0),
diff --git a/engines/ultima/ultima8/gumps/bark_gump.h b/engines/ultima/ultima8/gumps/bark_gump.h
index 43a65690bce..0c6eb3b1f5e 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.h
+++ b/engines/ultima/ultima8/gumps/bark_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_BARKGUMP_H
#define ULTIMA8_GUMPS_BARKGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/item_relative_gump.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -34,7 +34,7 @@ namespace Ultima8 {
*/
class BarkGump : public ItemRelativeGump {
protected:
- Std::string _barked;
+ Common::String _barked;
int32 _counter;
ObjId _textWidget;
uint32 _speechShapeNum;
@@ -47,7 +47,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
BarkGump();
- BarkGump(uint16 owner, const Std::string &msg, uint32 speechShapeNum = 0);
+ BarkGump(uint16 owner, const Common::String &msg, uint32 speechShapeNum = 0);
~BarkGump() override;
// Run the gump (decrement the counter)
diff --git a/engines/ultima/ultima8/gumps/book_gump.cpp b/engines/ultima/ultima8/gumps/book_gump.cpp
index 1840f48e1df..6f84815a3c9 100644
--- a/engines/ultima/ultima8/gumps/book_gump.cpp
+++ b/engines/ultima/ultima8/gumps/book_gump.cpp
@@ -39,7 +39,7 @@ BookGump::BookGump()
}
-BookGump::BookGump(ObjId owner, const Std::string &msg) :
+BookGump::BookGump(ObjId owner, const Common::String &msg) :
ModalGump(0, 0, 100, 100, owner), _text(msg),
_textWidgetL(0), _textWidgetR(0) {
}
@@ -59,8 +59,8 @@ void BookGump::InitGump(Gump *newparent, bool take_focus) {
//
Item *item = getItem(_owner);
if (item && item->getShape() == 0x120 && item->getQuality() == 0x66) {
- const Std::string placeholder = "spell of resurrection";
- const Std::string replacement = _TL_(placeholder);
+ const Common::String placeholder = "spell of resurrection";
+ const Common::String replacement = _TL_(placeholder);
if (replacement != placeholder)
_text = replacement;
}
diff --git a/engines/ultima/ultima8/gumps/book_gump.h b/engines/ultima/ultima8/gumps/book_gump.h
index 31132149b7b..c4599806809 100644
--- a/engines/ultima/ultima8/gumps/book_gump.h
+++ b/engines/ultima/ultima8/gumps/book_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_BOOKGUMP_H
#define ULTIMA8_GUMPS_BOOKGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -34,14 +34,14 @@ namespace Ultima8 {
* The gump to display the text of a book
*/
class BookGump : public ModalGump {
- Std::string _text;
+ Common::String _text;
ObjId _textWidgetL;
ObjId _textWidgetR;
public:
ENABLE_RUNTIME_CLASSTYPE()
BookGump();
- BookGump(ObjId owner, const Std::string &msg);
+ BookGump(ObjId owner, const Common::String &msg);
~BookGump() override;
// Go to the next page on mouse click
diff --git a/engines/ultima/ultima8/gumps/computer_gump.cpp b/engines/ultima/ultima8/gumps/computer_gump.cpp
index cce6d0d410f..74cbaea40e0 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.cpp
+++ b/engines/ultima/ultima8/gumps/computer_gump.cpp
@@ -21,7 +21,7 @@
#include "common/keyboard.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/computer_gump.h"
#include "ultima/ultima8/games/game_data.h"
#include "ultima/ultima8/audio/audio_process.h"
@@ -54,7 +54,7 @@ ComputerGump::ComputerGump()
}
}
-ComputerGump::ComputerGump(const Std::string &msg) :
+ComputerGump::ComputerGump(const Common::String &msg) :
ModalGump(0, 0, 100, 100), _curTextLine(0), _curDisplayLine(0),
_charOff(0), _nextCharTick(0), _paused(false), _tick(0) {
for (int i = 0; i < ARRAYSIZE(_renderedLines); i++) {
diff --git a/engines/ultima/ultima8/gumps/computer_gump.h b/engines/ultima/ultima8/gumps/computer_gump.h
index 3129a172b4d..8848f73d778 100644
--- a/engines/ultima/ultima8/gumps/computer_gump.h
+++ b/engines/ultima/ultima8/gumps/computer_gump.h
@@ -38,7 +38,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
ComputerGump();
- ComputerGump(const Std::string &msg);
+ ComputerGump(const Common::String &msg);
~ComputerGump() override;
// Close on mouse click on key press
diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 33f9d051cc6..6bcbb07f0d1 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -48,7 +48,7 @@ CreditsGump::CreditsGump()
}
}
-CreditsGump::CreditsGump(const Std::string &text, int parskip,
+CreditsGump::CreditsGump(const Common::String &text, int parskip,
uint32 flags, int32 layer)
: ModalGump(0, 0, 320, 200, 0, flags, layer), _text(text), _parSkip(parskip),
_timer(0), _title(nullptr), _nextTitle(nullptr), _state(CS_PLAYING),
@@ -107,8 +107,8 @@ void CreditsGump::Close(bool no_del) {
if (musicproc) musicproc->playMusic(0);
}
-void CreditsGump::extractLine(Std::string &text,
- char &modifier, Std::string &line) {
+void CreditsGump::extractLine(Common::String &text,
+ char &modifier, Common::String &line) {
if (!text.empty() && (text[0] == '+' || text[0] == '&' || text[0] == '}' ||
text[0] == '~' || text[0] == '@')) {
modifier = text[0];
@@ -122,18 +122,18 @@ void CreditsGump::extractLine(Std::string &text,
return;
}
- Std::string::size_type starpos = text.find('*');
+ Common::String::size_type starpos = text.find('*');
line = text.substr(0, starpos);
// replace '%%' by '%'.
// (Original interpreted these strings as format strings??)
- Std::string::size_type ppos;
- while ((ppos = line.find("%%")) != Std::string::npos) {
+ Common::String::size_type ppos;
+ while ((ppos = line.find("%%")) != Common::String::npos) {
line.replace(ppos, 2, "%");
}
- if (starpos != Std::string::npos) starpos++;
+ if (starpos != Common::String::npos) starpos++;
text.erase(0, starpos);
}
@@ -197,8 +197,8 @@ void CreditsGump::run() {
bool done = false;
bool firstline = true;
while (!_text.empty() && !done) {
- Std::string::size_type endline = _text.find('\n');
- Std::string line = _text.substr(0, endline);
+ Common::String::size_type endline = _text.find('\n');
+ Common::String line = _text.substr(0, endline);
if (line.empty()) {
_text.erase(0, 1);
@@ -216,7 +216,7 @@ void CreditsGump::run() {
continue;
}
- Std::string titletext;
+ Common::String titletext;
char modifier;
extractLine(line, modifier, titletext);
@@ -242,7 +242,7 @@ void CreditsGump::run() {
int indent = 0;
while (!line.empty()) {
- Std::string outline;
+ Common::String outline;
char modifier;
unsigned int remaining;
extractLine(line, modifier, outline);
@@ -334,7 +334,7 @@ void CreditsGump::run() {
}
- if (endline != Std::string::npos) endline++;
+ if (endline != Common::String::npos) endline++;
_text.erase(0, endline);
firstline = false;
diff --git a/engines/ultima/ultima8/gumps/credits_gump.h b/engines/ultima/ultima8/gumps/credits_gump.h
index 1a643e1ef6b..daf2b656708 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.h
+++ b/engines/ultima/ultima8/gumps/credits_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_CREDITSGUMP_H
#define ULTIMA8_GUMPS_CREDITSGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -39,7 +39,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
CreditsGump();
- CreditsGump(const Std::string &text, int parskip = 24,
+ CreditsGump(const Common::String &text, int parskip = 24,
uint32 flags = FLAG_PREVENT_SAVE, int32 layer = LAYER_MODAL);
~CreditsGump() override;
@@ -47,7 +47,7 @@ public:
void InitGump(Gump *newparent, bool take_focus = true) override;
// Set a configuration option to true when user watches entire sequence
- void SetFlagWhenFinished(Std::string configKey) {
+ void SetFlagWhenFinished(Common::String configKey) {
_configKey = configKey;
}
@@ -62,9 +62,9 @@ public:
protected:
- void extractLine(Std::string &text, char &modifier, Std::string &line);
+ void extractLine(Common::String &text, char &modifier, Common::String &line);
- Std::string _text;
+ Common::String _text;
int _parSkip;
enum CreditsState {
@@ -84,7 +84,7 @@ protected:
int _currentSurface;
int _currentY;
- Std::string _configKey;
+ Common::String _configKey;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
index d05451f58f7..356bc0b2c1f 100644
--- a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
@@ -85,7 +85,7 @@ void CruAmmoGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
const int yoff = GAME_IS_REMORSE ? REM_YOFF : REG_YOFF;
const int fontno = GAME_IS_REMORSE ? REM_FONT_NUM : REG_FONT_NUM;
- const Std::string bulletstr = Std::string::format("%d", bullets);
+ const Common::String bulletstr = Common::String::format("%d", bullets);
if (!_bulletsText || !bulletstr.equals(_bulletsText->getText())) {
if (_bulletsText) {
RemoveChild(_bulletsText);
@@ -104,7 +104,7 @@ void CruAmmoGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
}
}
- const Std::string clipstr = Std::string::format("%d", clips);
+ const Common::String clipstr = Common::String::format("%d", clips);
if (!_clipsText || !clipstr.equals(_clipsText->getText())) {
if (_clipsText) {
RemoveChild(_clipsText);
diff --git a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
index 01f532e9c4c..de4a033cdc1 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
@@ -108,8 +108,8 @@ void CruInventoryGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool sc
if (q > 1) {
// This isn't the most efficient way to work out if we need to make new
// text, but it works..
- const Std::string qtext = Std::string::format("%d", q);
- const Std::string ¤ttext = _inventoryText->getText();
+ const Common::String qtext = Common::String::format("%d", q);
+ const Common::String ¤ttext = _inventoryText->getText();
if (!qtext.equals(currenttext)) {
RemoveChild(_inventoryText);
_inventoryText->Close();
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp b/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
index bbc9d6de2ef..b6da304d380 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_pickup_gump.cpp
@@ -149,7 +149,7 @@ void CruPickupGump::updateForNewItem(const Item *item) {
void CruPickupGump::addCountText() {
if (_q <= 1 || !_showCount)
return;
- Std::string qstr = Std::string::format("%d", _q);
+ Common::String qstr = Common::String::format("%d", _q);
TextWidget *count = new TextWidget(ITEM_AREA_WIDTH / 2 + 22, _dims.height() / 2 + 3, qstr, true, COUNT_TEXT_FONT);
count->InitGump(this, false);
count->SetIndex(COUNT_TEXT_INDEX);
diff --git a/engines/ultima/ultima8/gumps/cru_pickup_gump.h b/engines/ultima/ultima8/gumps/cru_pickup_gump.h
index cc328c15f2a..0d371ebc69c 100644
--- a/engines/ultima/ultima8/gumps/cru_pickup_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_pickup_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_CRUPICKUPGUMP_H
#define ULTIMA8_GUMPS_CRUPICKUPGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -69,7 +69,7 @@ private:
uint32 _itemShapeNo;
uint16 _gumpShapeNo;
uint16 _gumpFrameNo;
- Std::string _itemName;
+ Common::String _itemName;
uint16 _q;
bool _showCount;
};
diff --git a/engines/ultima/ultima8/gumps/menu_gump.cpp b/engines/ultima/ultima8/gumps/menu_gump.cpp
index 462589d107e..dafc5bc1acf 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.cpp
+++ b/engines/ultima/ultima8/gumps/menu_gump.cpp
@@ -146,7 +146,7 @@ void MenuGump::InitGump(Gump *newparent, bool take_focus) {
}
const MainActor *av = getMainActor();
- Std::string name;
+ Common::String name;
if (av)
name = av->getName();
@@ -205,7 +205,7 @@ bool MenuGump::OnKeyDown(int key, int mod) {
void MenuGump::ChildNotify(Gump *child, uint32 message) {
EditWidget *editwidget = dynamic_cast<EditWidget *>(child);
if (editwidget && message == EditWidget::EDIT_ENTER) {
- Std::string name = editwidget->getText();
+ Common::String name = editwidget->getText();
if (!name.empty()) {
MainActor *av = getMainActor();
av->setName(name);
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index af5fd9b3805..c9e9328ff93 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -38,14 +38,14 @@ MessageBoxGump::MessageBoxGump()
}
-MessageBoxGump::MessageBoxGump(const Std::string &title, const Std::string &message, uint32 titleColour,
- Std::vector<Std::string> *buttons) :
+MessageBoxGump::MessageBoxGump(const Common::String &title, const Common::String &message, uint32 titleColour,
+ Std::vector<Common::String> *buttons) :
ModalGump(0, 0, 100, 100), _title(title), _message(message), _titleColour(titleColour) {
if (buttons)
buttons->swap(_buttons);
if (_buttons.empty())
- _buttons.push_back(Std::string("Ok"));
+ _buttons.push_back(Common::String("Ok"));
}
MessageBoxGump::~MessageBoxGump(void) {
@@ -146,7 +146,7 @@ void MessageBoxGump::ChildNotify(Gump *child, uint32 msg) {
}
}
-ProcId MessageBoxGump::Show(Std::string _title, Std::string _message, uint32 titleColour, Std::vector<Std::string> *_buttons) {
+ProcId MessageBoxGump::Show(Common::String _title, Common::String _message, uint32 titleColour, Std::vector<Common::String> *_buttons) {
Gump *gump = new MessageBoxGump(_title, _message, titleColour, _buttons);
gump->InitGump(0);
gump->setRelativePosition(CENTER);
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index a4aa9c084a4..6fbad0a7675 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -25,7 +25,7 @@
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/classtype.h"
#include "ultima/ultima8/gfx/texture.h"
@@ -38,15 +38,15 @@ namespace Ultima8 {
* In Crusader, this should be used for things like the "Targeting reticle [in]active." message
*/
class MessageBoxGump : public ModalGump {
- Std::string _title;
- Std::string _message;
- Std::vector<Std::string> _buttons;
+ Common::String _title;
+ Common::String _message;
+ Std::vector<Common::String> _buttons;
int _titleColour;
public:
ENABLE_RUNTIME_CLASSTYPE()
MessageBoxGump();
- MessageBoxGump(const Std::string &title, const Std::string &message, uint32 title_colour, Std::vector<Std::string> *buttons);
+ MessageBoxGump(const Common::String &title, const Common::String &message, uint32 title_colour, Std::vector<Common::String> *buttons);
~MessageBoxGump() override;
// Init the gump, call after construction
@@ -64,8 +64,8 @@ public:
//! \param titleColour The colour to be displayed behind the title bar
//! \param buttons Array of button names to be displayed. Default is "Ok"
//! \return Pid of process that will have the result when finished
- static ProcId Show(Std::string title, Std::string message, uint32 titleColour, Std::vector<Std::string> *buttons = 0);
- static ProcId Show(Std::string title, Std::string message, Std::vector<Std::string> *buttons) {
+ static ProcId Show(Common::String title, Common::String message, uint32 titleColour, Std::vector<Common::String> *buttons = 0);
+ static ProcId Show(Common::String title, Common::String message, Std::vector<Common::String> *buttons) {
return Show(title, message, TEX32_PACK_RGB(0x30, 0x30, 0x8F), buttons);
}
diff --git a/engines/ultima/ultima8/gumps/movie_gump.cpp b/engines/ultima/ultima8/gumps/movie_gump.cpp
index 515a2696b9f..a7a18a8eaa2 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.cpp
+++ b/engines/ultima/ultima8/gumps/movie_gump.cpp
@@ -54,7 +54,7 @@ static const uint32 IFF_LANG_FR = MKTAG('F', 'R', 'E', 'N');
static const uint32 IFF_LANG_EN = MKTAG('E', 'N', 'G', 'L');
static const uint32 IFF_LANG_DE = MKTAG('G', 'E', 'R', 'M');
-static Std::string _fixCrusaderMovieName(const Std::string &s) {
+static Common::String _fixCrusaderMovieName(const Common::String &s) {
/*
HACK! The game comes with movies MVA01.AVI etc, but the usecode mentions both
MVA01 and MVA1. We do a translation here. These are the strings we need to fix:
@@ -68,7 +68,7 @@ static Std::string _fixCrusaderMovieName(const Std::string &s) {
0B52: 0D push string "mva9"
*/
if (s.size() == 4)
- return Std::string::format("mva0%c", s[3]);
+ return Common::String::format("mva0%c", s[3]);
else if (s.equals("mva3a"))
return "mva03a";
else if (s.equals("mva5a"))
@@ -77,12 +77,12 @@ static Std::string _fixCrusaderMovieName(const Std::string &s) {
return s;
}
-static Common::SeekableReadStream *_tryLoadCruMovieFile(const Std::string &filename, const char *extn) {
- const Std::string path = Std::string::format("flics/%s.%s", filename.c_str(), extn);
+static Common::SeekableReadStream *_tryLoadCruMovieFile(const Common::String &filename, const char *extn) {
+ const Common::String path = Common::String::format("flics/%s.%s", filename.c_str(), extn);
auto *rs = new Common::File();
if (!rs->open(path.c_str())) {
// Try with a "0" in the name
- const Std::string adjustedfn = Std::string::format("flics/0%s.%s", filename.c_str(), extn);
+ const Common::String adjustedfn = Common::String::format("flics/0%s.%s", filename.c_str(), extn);
if (!rs->open(adjustedfn.c_str())) {
delete rs;
return nullptr;
@@ -91,7 +91,7 @@ static Common::SeekableReadStream *_tryLoadCruMovieFile(const Std::string &filen
return rs;
}
-static Common::SeekableReadStream *_tryLoadCruAVI(const Std::string &filename) {
+static Common::SeekableReadStream *_tryLoadCruAVI(const Common::String &filename) {
Common::SeekableReadStream *rs = _tryLoadCruMovieFile(filename, "avi");
if (!rs)
warning("movie %s not found", filename.c_str());
@@ -100,7 +100,7 @@ static Common::SeekableReadStream *_tryLoadCruAVI(const Std::string &filename) {
// Convenience function that tries to open both TXT (No Remorse)
// and IFF (No Regret) subtitle formats.
-static Common::SeekableReadStream *_tryLoadCruSubtitle(const Std::string &filename) {
+static Common::SeekableReadStream *_tryLoadCruSubtitle(const Common::String &filename) {
Common::SeekableReadStream *txtfile = _tryLoadCruMovieFile(filename, "txt");
if (txtfile)
return txtfile;
@@ -255,7 +255,7 @@ ProcId MovieGump::U8MovieViewer(Common::SeekableReadStream *rs, bool fade, bool
}
}
-/*static*/ MovieGump *MovieGump::CruMovieViewer(const Std::string fname, int x, int y, const byte *pal, Gump *parent, uint16 frameshape) {
+/*static*/ MovieGump *MovieGump::CruMovieViewer(const Common::String fname, int x, int y, const byte *pal, Gump *parent, uint16 frameshape) {
Common::SeekableReadStream *rs = _tryLoadCruAVI(fname);
if (!rs)
return nullptr;
diff --git a/engines/ultima/ultima8/gumps/movie_gump.h b/engines/ultima/ultima8/gumps/movie_gump.h
index b6e942a4c94..37d4443a01c 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.h
+++ b/engines/ultima/ultima8/gumps/movie_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_MOVIEGUMP_H
#define ULTIMA8_GUMPS_MOVIEGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -55,7 +55,7 @@ public:
bool OnKeyDown(int key, int mod) override;
static ProcId U8MovieViewer(Common::SeekableReadStream *rs, bool fade, bool introMusicHack, bool noScale);
- static MovieGump *CruMovieViewer(const Std::string fname, int x, int y, const byte *pal, Gump *parent, uint16 frameshape);
+ static MovieGump *CruMovieViewer(const Common::String fname, int x, int y, const byte *pal, Gump *parent, uint16 frameshape);
bool loadData(Common::ReadStream *rs);
void saveData(Common::WriteStream *ws) override;
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
index 45a30297489..6e7dd3f4f0a 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -134,7 +134,7 @@ void PaperdollGump::Close(bool no_del) {
}
void PaperdollGump::PaintStat(RenderSurface *surf, unsigned int n,
- Std::string text, int val) {
+ Common::String text, int val) {
assert(n < 7); // constant!
Font *font, *descfont;
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.h b/engines/ultima/ultima8/gumps/paperdoll_gump.h
index 08a789ccf17..8b8e29e68c5 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.h
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_PAPERDOLLGUMP_H
#define ULTIMA8_GUMPS_PAPERDOLLGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/container_gump.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -75,7 +75,7 @@ protected:
//! Paint a single stat
void PaintStat(RenderSurface *surf, unsigned int n,
- Std::string text, int val);
+ Common::String text, int val);
RenderedText *_cachedText[14]; // constant!!
int _cachedVal[7]; // constant!!
diff --git a/engines/ultima/ultima8/gumps/quit_gump.cpp b/engines/ultima/ultima8/gumps/quit_gump.cpp
index 34dc2d876f2..0b58e0c97a3 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.cpp
+++ b/engines/ultima/ultima8/gumps/quit_gump.cpp
@@ -102,7 +102,7 @@ void QuitGump::InitGump(Gump *newparent, bool take_focus) {
if (askshape._shapeNum == 0) {
// In JP U8, the ask gump is replaced with text
// confirming quit
- Std::string askstr = _TL_("Quit the game?");
+ Common::String askstr = _TL_("Quit the game?");
Gump *widget = new TextWidget(0, 0, askstr, true, 6); // CONSTANT!
widget->InitGump(this, false);
widget->setRelativePosition(TOP_CENTER, 0, 13);
@@ -177,9 +177,9 @@ void QuitGump::ChildNotify(Gump *child, uint32 message) {
bool QuitGump::OnTextInput(int unicode) {
if (!(unicode & 0xFF80)) {
char c = unicode & 0x7F;
- if (_TL_("Yy").find(c) != Std::string::npos) {
+ if (_TL_("Yy").find(c) != Common::String::npos) {
Ultima8Engine::get_instance()->quitGame();
- } else if (_TL_("Nn").find(c) != Std::string::npos) {
+ } else if (_TL_("Nn").find(c) != Common::String::npos) {
Close();
}
}
diff --git a/engines/ultima/ultima8/gumps/readable_gump.cpp b/engines/ultima/ultima8/gumps/readable_gump.cpp
index a22488fae60..2a4e4cb1957 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.cpp
+++ b/engines/ultima/ultima8/gumps/readable_gump.cpp
@@ -41,7 +41,7 @@ ReadableGump::ReadableGump()
}
-ReadableGump::ReadableGump(ObjId owner, uint16 shape, int font, const Std::string &msg) :
+ReadableGump::ReadableGump(ObjId owner, uint16 shape, int font, const Common::String &msg) :
ModalGump(0, 0, 100, 100, owner), _shapeNum(shape), _fontNum(font), _text(msg) {
}
@@ -60,10 +60,10 @@ void ReadableGump::InitGump(Gump *newparent, bool take_focus) {
if (Ultima8Engine::get_instance()->getGameInfo()->_language ==
GameInfo::GAMELANG_JAPANESE) {
// Japanese subtitles
- Std::string::size_type pos;
+ Common::String::size_type pos;
pos = _text.find('%');
- if (pos != Std::string::npos) {
- Std::string jpsub = _text.substr(pos + 1);
+ if (pos != Common::String::npos) {
+ Common::String jpsub = _text.substr(pos + 1);
_text = _text.substr(0, pos);
Gump *subwidget = new TextWidget(0, 0, jpsub, true, jpsub_font, 0, 0, Font::TEXT_CENTER);
diff --git a/engines/ultima/ultima8/gumps/readable_gump.h b/engines/ultima/ultima8/gumps/readable_gump.h
index 83de65a9eca..4f9a6ce47cc 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.h
+++ b/engines/ultima/ultima8/gumps/readable_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_READABLEGUMP_H
#define ULTIMA8_GUMPS_READABLEGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -36,12 +36,12 @@ namespace Ultima8 {
class ReadableGump : public ModalGump {
uint16 _shapeNum;
int _fontNum;
- Std::string _text;
+ Common::String _text;
public:
ENABLE_RUNTIME_CLASSTYPE()
ReadableGump();
- ReadableGump(ObjId owner, uint16 shape, int font, const Std::string &msg);
+ ReadableGump(ObjId owner, uint16 shape, int font, const Common::String &msg);
~ReadableGump() override;
// Close on mouse click on key press
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.cpp b/engines/ultima/ultima8/gumps/scroll_gump.cpp
index bea4e4216be..38c1d3a3869 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/scroll_gump.cpp
@@ -41,7 +41,7 @@ ScrollGump::ScrollGump()
}
-ScrollGump::ScrollGump(ObjId owner, const Std::string &msg) :
+ScrollGump::ScrollGump(ObjId owner, const Common::String &msg) :
ModalGump(0, 0, 100, 100, owner), _text(msg), _textWidget(0) {
}
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.h b/engines/ultima/ultima8/gumps/scroll_gump.h
index 8e3abca42de..e2ebda22232 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.h
+++ b/engines/ultima/ultima8/gumps/scroll_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_SCROLLGUMP_H
#define ULTIMA8_GUMPS_SCROLLGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/usecode/intrinsics.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -34,13 +34,13 @@ namespace Ultima8 {
* A paper scroll (with a spell, etc)
*/
class ScrollGump : public ModalGump {
- Std::string _text;
+ Common::String _text;
ObjId _textWidget;
public:
ENABLE_RUNTIME_CLASSTYPE()
ScrollGump();
- ScrollGump(ObjId owner, const Std::string &msg);
+ ScrollGump(ObjId owner, const Common::String &msg);
~ScrollGump() override;
// Go to the next page on mouse click
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index 08664fb11d0..07320f12bb5 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -227,7 +227,7 @@ void U8SaveGump::ChildNotify(Gump *child, uint32 message) {
// save
assert(_save);
- Std::string name = widget->getText();
+ Common::String name = widget->getText();
if (name.empty()) return;
// Note: this might close us, so we should return right after.
@@ -274,7 +274,7 @@ bool U8SaveGump::loadgame(int saveIndex) {
return true;
}
-bool U8SaveGump::savegame(int saveIndex, const Std::string &name) {
+bool U8SaveGump::savegame(int saveIndex, const Common::String &name) {
if (name.empty())
return false;
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.h b/engines/ultima/ultima8/gumps/u8_save_gump.h
index 32d4ecbffb7..e2ad6856d46 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.h
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_U8SAVEGUMP_H
#define ULTIMA8_GUMPS_U8SAVEGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -58,12 +58,12 @@ protected:
int _page;
Std::vector<EditWidget *> _editWidgets;
- Std::vector<Std::string> _descriptions;
+ Std::vector<Common::String> _descriptions;
void loadDescriptions();
bool loadgame(int saveIndex);
- bool savegame(int saveIndex, const Std::string &name);
+ bool savegame(int saveIndex, const Common::String &name);
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.cpp b/engines/ultima/ultima8/gumps/weasel_gump.cpp
index 29162eb8041..5b83de249bb 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.cpp
+++ b/engines/ultima/ultima8/gumps/weasel_gump.cpp
@@ -193,7 +193,7 @@ void WeaselGump::InitGump(Gump *newparent, bool take_focus) {
Close();
}
-Gump *WeaselGump::playMovie(const Std::string &filename) {
+Gump *WeaselGump::playMovie(const Common::String &filename) {
MovieGump *gump = MovieGump::CruMovieViewer(filename, 600, 450, nullptr, this, 0);
if (!gump) {
warning("Couldn't load flic %s", filename.c_str());
@@ -410,7 +410,7 @@ void WeaselGump::checkBuyMore() {
setYesNoQuestion(buymore);
}
-void WeaselGump::setYesNoQuestion(const Std::string &msg) {
+void WeaselGump::setYesNoQuestion(const Common::String &msg) {
browsingMode(false);
_closeIfExists(_ui->FindGump(&FindByIndex<kTxtQuestion>));
TextWidget *textWidget = new TextWidget(30, 100, msg, true, WEASEL_FONT, 150);
@@ -502,7 +502,7 @@ void WeaselGump::updateItemDisplay() {
_closeIfExists(_ui->FindGump(&FindByIndex<kTxtItemOwned>));
_closeIfExists(_ui->FindGump(&FindByIndex<kIconItem>));
- Std::string credstr = Std::string::format("Credits:%d", _credits);
+ Common::String credstr = Common::String::format("Credits:%d", _credits);
TextWidget *textWidget = new TextWidget(30, 57, credstr, true, WEASEL_FONT);
textWidget->InitGump(_ui);
textWidget->SetIndex(kTxtCredits);
@@ -515,8 +515,8 @@ void WeaselGump::updateItemDisplay() {
icon->InitGump(_ui, false);
icon->SetIndex(kIconItem);
- Std::string coststr = Std::string::format("Cost:%d", _curItemCost);
- Std::string purchstr = Std::string::format("Purchased:%02d", purchasedCount(_curItemShape));
+ Common::String coststr = Common::String::format("Cost:%d", _curItemCost);
+ Common::String purchstr = Common::String::format("Purchased:%02d", purchasedCount(_curItemShape));
MainActor *av = getMainActor();
const Item *item = av->getFirstItemWithShape(_curItemShape, true);
@@ -528,7 +528,7 @@ void WeaselGump::updateItemDisplay() {
count = item->getQuality();
}
}
- Std::string ownedstr = Std::string::format("Owned:%02d", count);
+ Common::String ownedstr = Common::String::format("Owned:%02d", count);
TextWidget *nametxt = new TextWidget(27, 161, shapeinfo->_weaponInfo->_name, true, WEASEL_FONT);
nametxt->InitGump(_ui, false);
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.h b/engines/ultima/ultima8/gumps/weasel_gump.h
index c0b52144d63..2338093ba60 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.h
+++ b/engines/ultima/ultima8/gumps/weasel_gump.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_REMORSEMENUGUMP_H
#define ULTIMA8_GUMPS_REMORSEMENUGUMP_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/modal_gump.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -84,12 +84,12 @@ private:
void abortPurchase();
void checkBuyMore();
void confirmPurchase();
- void setYesNoQuestion(const Std::string &msg);
+ void setYesNoQuestion(const Common::String &msg);
void browsingMode(bool browsing);
int purchasedCount(uint16 shape) const;
void updateItemDisplay();
- Gump *playMovie(const Std::string &filename);
+ Gump *playMovie(const Common::String &filename);
/// Gump to hold all the UI items (not the movies)
Gump *_ui;
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.cpp b/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
index fdfd56a357d..e2dee1ea357 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.cpp
@@ -38,7 +38,7 @@ ButtonWidget::ButtonWidget() : Gump(), _shapeUp(nullptr), _shapeDown(nullptr),
_frameNumDown(0), _mouseOverBlendCol(0), _textWidget(0) {
}
-ButtonWidget::ButtonWidget(int x, int y, Std::string txt, bool gamefont,
+ButtonWidget::ButtonWidget(int x, int y, Common::String txt, bool gamefont,
int font, uint32 mouseOverBlendCol,
int w, int h, int32 layer) :
Gump(x, y, w, h, 0, 0, layer), _shapeUp(nullptr), _shapeDown(nullptr),
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.h b/engines/ultima/ultima8/gumps/widgets/button_widget.h
index 582da083e54..b9a23c95af0 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_GUMPS_WIDGETS_BUTTONWIDGET_H
#define ULTIMA8_GUMPS_WIDGETS_BUTTONWIDGET_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/gumps/gump.h"
#include "ultima/ultima8/gfx/frame_id.h"
#include "ultima/ultima8/misc/classtype.h"
@@ -36,7 +36,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
ButtonWidget();
- ButtonWidget(int x, int y, Std::string txt, bool gamefont, int font,
+ ButtonWidget(int x, int y, Common::String txt, bool gamefont, int font,
uint32 mouseOverBlendCol = 0, int width = 0, int height = 0,
int32 layer = LAYER_NORMAL);
ButtonWidget(int x, int y, FrameID frame_up, FrameID frame_down,
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index 6226635f11e..85eaf7b14b0 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -31,7 +31,7 @@ namespace Ultima8 {
DEFINE_RUNTIME_CLASSTYPE_CODE(EditWidget)
-EditWidget::EditWidget(int x, int y, Std::string txt, bool gamefont, int font,
+EditWidget::EditWidget(int x, int y, Common::String txt, bool gamefont, int font,
int w, int h, unsigned int maxlength, bool multiline)
: Gump(x, y, w, h), _text(txt), _gameFont(gamefont), _fontNum(font),
_maxLength(maxlength), _multiLine(multiline),
@@ -66,7 +66,7 @@ Font *EditWidget::getFont() const {
return FontManager::get_instance()->getTTFont(_fontNum);
}
-void EditWidget::setText(const Std::string &t) {
+void EditWidget::setText(const Common::String &t) {
_text = t;
_cursor = _text.size();
delete _cachedText;
@@ -78,7 +78,7 @@ void EditWidget::ensureCursorVisible() {
_cursorChanged = g_system->getMillis();
}
-bool EditWidget::textFits(Std::string &t) {
+bool EditWidget::textFits(Common::String &t) {
Font *font = getFont();
unsigned int remaining;
@@ -148,7 +148,7 @@ void EditWidget::renderText() {
max_width, max_height,
Font::TEXT_LEFT,
false, false,
- cv ? _cursor : Std::string::npos);
+ cv ? _cursor : Common::String::npos);
// Trim text to fit
if (remaining < _text.size()) {
@@ -252,7 +252,7 @@ bool EditWidget::OnTextInput(int unicode) {
c = reverse_encoding[unicode];
if (!c) return true;
- Std::string newtext = _text;
+ Common::String newtext = _text;
newtext.insertChar(c, _cursor);
if (textFits(newtext)) {
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.h b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
index d48b4413e54..926aa79b46b 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
@@ -40,7 +40,7 @@ class EditWidget : public Gump {
public:
ENABLE_RUNTIME_CLASSTYPE()
- EditWidget(int x, int y, Std::string txt, bool gamefont, int fontnum,
+ EditWidget(int x, int y, Common::String txt, bool gamefont, int fontnum,
int width, int height, unsigned int maxlength = 0,
bool multiline = false);
~EditWidget() override;
@@ -58,10 +58,10 @@ public:
void OnFocus(bool gain) override;
//! get the current text
- Std::string getText() const {
+ Common::String getText() const {
return _text;
}
- void setText(const Std::string &t);
+ void setText(const Common::String &t);
enum Message {
EDIT_ENTER = 16,
@@ -70,8 +70,8 @@ public:
protected:
- Std::string _text;
- Std::string::size_type _cursor;
+ Common::String _text;
+ Common::String::size_type _cursor;
bool _gameFont;
int _fontNum;
unsigned int _maxLength;
@@ -81,7 +81,7 @@ protected:
bool _cursorVisible;
void ensureCursorVisible();
- bool textFits(Std::string &t);
+ bool textFits(Common::String &t);
void renderText();
Font *getFont() const;
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index 98952182463..efc5fd9d1fb 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -37,7 +37,7 @@ TextWidget::TextWidget() : Gump(), _gameFont(false), _fontNum(0), _blendColour(0
_cachedText(nullptr), _textAlign(Font::TEXT_LEFT) {
}
-TextWidget::TextWidget(int x, int y, const Std::string &txt, bool gamefont, int font,
+TextWidget::TextWidget(int x, int y, const Common::String &txt, bool gamefont, int font,
int w, int h, Font::TextAlign align, bool dopaging) :
Gump(x, y, w, h), _text(txt), _gameFont(gamefont), _fontNum(font),
_blendColour(0), _currentStart(0), _currentEnd(0), _tx(0), _ty(0),
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.h b/engines/ultima/ultima8/gumps/widgets/text_widget.h
index 57594f6101f..402d8ad48a5 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.h
@@ -37,7 +37,7 @@ class RenderedText;
class TextWidget : public Gump {
protected:
- Std::string _text;
+ Common::String _text;
bool _gameFont;
int _fontNum;
uint32 _blendColour;
@@ -55,7 +55,7 @@ public:
ENABLE_RUNTIME_CLASSTYPE()
TextWidget();
- TextWidget(int x, int y, const Std::string &txt, bool gamefont, int fontnum,
+ TextWidget(int x, int y, const Common::String &txt, bool gamefont, int fontnum,
int width = 0, int height = 0,
Font::TextAlign align = Font::TEXT_LEFT,
bool dopaging = false);
@@ -94,7 +94,7 @@ public:
//! get the RenderedText's vlead
int getVlead();
- const Std::string &getText() const {
+ const Common::String &getText() const {
return _text;
}
diff --git a/engines/ultima/ultima8/kernel/kernel.cpp b/engines/ultima/ultima8/kernel/kernel.cpp
index e7073b5534a..24e5df1fb38 100644
--- a/engines/ultima/ultima8/kernel/kernel.cpp
+++ b/engines/ultima/ultima8/kernel/kernel.cpp
@@ -387,7 +387,7 @@ void Kernel::save(Common::WriteStream *ws) {
_pIDs->save(ws);
ws->writeUint32LE(_processes.size());
for (auto *p : _processes) {
- const Std::string & classname = p->GetClassType()._className; // virtual
+ const Common::String & classname = p->GetClassType()._className; // virtual
assert(classname.size());
Common::HashMap<Common::String, ProcessLoadFunc>::iterator iter;
@@ -451,7 +451,7 @@ Process *Kernel::loadProcess(Common::ReadStream *rs, uint32 version) {
rs->read(buf, classlen);
buf[classlen] = 0;
- Std::string classname = buf;
+ Common::String classname = buf;
delete[] buf;
Common::HashMap<Common::String, ProcessLoadFunc>::iterator iter;
diff --git a/engines/ultima/ultima8/kernel/kernel.h b/engines/ultima/ultima8/kernel/kernel.h
index 4cae15ad4ba..0a9eabd1dff 100644
--- a/engines/ultima/ultima8/kernel/kernel.h
+++ b/engines/ultima/ultima8/kernel/kernel.h
@@ -23,7 +23,7 @@
#define ULTIMA8_KERNEL_KERNEL_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/usecode/intrinsics.h"
namespace Ultima {
@@ -124,7 +124,7 @@ public:
return _frameByFrame;
}
- void addProcessLoader(Std::string classname, ProcessLoadFunc func) {
+ void addProcessLoader(Common::String classname, ProcessLoadFunc func) {
_processLoaders[classname] = func;
}
diff --git a/engines/ultima/ultima8/kernel/object_manager.cpp b/engines/ultima/ultima8/kernel/object_manager.cpp
index 933b4a360c6..31043dd44f9 100644
--- a/engines/ultima/ultima8/kernel/object_manager.cpp
+++ b/engines/ultima/ultima8/kernel/object_manager.cpp
@@ -238,7 +238,7 @@ bool ObjectManager::load(Common::ReadStream *rs, uint32 version) {
rs->read(buf, classlen);
buf[classlen] = 0;
- Std::string classname = buf;
+ Common::String classname = buf;
delete[] buf;
Object *obj = loadObject(rs, classname, version);
@@ -303,7 +303,7 @@ bool ObjectManager::load(Common::ReadStream *rs, uint32 version) {
}
void ObjectManager::saveObject(Common::WriteStream *ws, Object *obj) const {
- const Std::string & classname = obj->GetClassType()._className; // note: virtual
+ const Common::String & classname = obj->GetClassType()._className; // note: virtual
Common::HashMap<Common::String, ObjectLoadFunc>::iterator iter;
iter = _objectLoaders.find(classname);
@@ -322,13 +322,13 @@ Object *ObjectManager::loadObject(Common::ReadStream *rs, uint32 version) {
rs->read(buf, classlen);
buf[classlen] = 0;
- Std::string classname = buf;
+ Common::String classname = buf;
delete[] buf;
return loadObject(rs, classname, version);
}
-Object *ObjectManager::loadObject(Common::ReadStream *rs, Std::string classname,
+Object *ObjectManager::loadObject(Common::ReadStream *rs, Common::String classname,
uint32 version) {
Common::HashMap<Common::String, ObjectLoadFunc>::iterator iter;
iter = _objectLoaders.find(classname);
diff --git a/engines/ultima/ultima8/kernel/object_manager.h b/engines/ultima/ultima8/kernel/object_manager.h
index d6f2d3204b0..d73646a04b7 100644
--- a/engines/ultima/ultima8/kernel/object_manager.h
+++ b/engines/ultima/ultima8/kernel/object_manager.h
@@ -22,7 +22,7 @@
#ifndef ULTIMA8_KERNEL_OBJECTMANAGER_H
#define ULTIMA8_KERNEL_OBJECTMANAGER_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/misc/common_types.h"
@@ -74,11 +74,11 @@ public:
idMan *_actorIDs;
private:
- Object *loadObject(Common::ReadStream *rs, Std::string classname, uint32 version);
+ Object *loadObject(Common::ReadStream *rs, Common::String classname, uint32 version);
void setupLoaders();
- void addObjectLoader(Std::string classname, ObjectLoadFunc func) {
+ void addObjectLoader(Common::String classname, ObjectLoadFunc func) {
_objectLoaders[classname] = func;
}
Common::HashMap<Common::String, ObjectLoadFunc> _objectLoaders;
diff --git a/engines/ultima/ultima8/misc/util.cpp b/engines/ultima/ultima8/misc/util.cpp
index 7a8166c03fc..e162a3ac293 100644
--- a/engines/ultima/ultima8/misc/util.cpp
+++ b/engines/ultima/ultima8/misc/util.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/misc/util.h"
namespace Ultima {
@@ -110,7 +110,7 @@ template<class T> void SplitString(const T &args, char sep,
}
-template void SplitString<Std::string>(const Std::string &args, char sep, Std::vector<Std::string> &argv);
+template void SplitString<Common::String>(const Common::String &args, char sep, Std::vector<Common::String> &argv);
template<class T> void SplitStringKV(const T &args, char sep,
Std::vector<Common::Pair<T, T> > &argv) {
@@ -139,7 +139,7 @@ template<class T> void SplitStringKV(const T &args, char sep,
}
}
-template void SplitStringKV<Std::string>(const Std::string &args, char sep, Std::vector<Common::Pair<Std::string, Std::string> > &argv);
+template void SplitStringKV<Common::String>(const Common::String &args, char sep, Std::vector<Common::Pair<Common::String, Common::String> > &argv);
} // End of namespace Ultima8
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index df102428127..86fed0196dc 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -109,8 +109,6 @@
namespace Ultima {
namespace Ultima8 {
-using Std::string;
-
// a bit of a hack to prevent having to write a load function for
// every process
template<class T>
@@ -507,7 +505,7 @@ bool Ultima8Engine::setupGame() {
}
// output detected game info
- Std::string details = info->getPrintDetails();
+ Common::String details = info->getPrintDetails();
debug(1, "%s: %s", info->_name.c_str(), details.c_str());
_gameInfo = info;
@@ -1505,7 +1503,7 @@ Common::Error Ultima8Engine::loadGameStream(Common::SeekableReadStream *stream)
}
if (!_gameInfo->match(saveinfo, true)) {
- Std::string message = "Game mismatch\n";
+ Common::String message = "Game mismatch\n";
message += "Running _game: " + _gameInfo->getPrintDetails() + "\n";
message += "Savegame : " + saveinfo.getPrintDetails();
@@ -1532,7 +1530,7 @@ Common::Error Ultima8Engine::loadGameStream(Common::SeekableReadStream *stream)
// expected - anything else suggests a corrupt save (or a bug)
bool totalok = true;
- Std::string message;
+ Common::String message;
// UCSTRINGS, UCGLOBALS, UCLISTS don't depend on anything else,
// so load these first
diff --git a/engines/ultima/ultima8/usecode/intrinsics.h b/engines/ultima/ultima8/usecode/intrinsics.h
index 9ab58fcdd50..7b19609133d 100644
--- a/engines/ultima/ultima8/usecode/intrinsics.h
+++ b/engines/ultima/ultima8/usecode/intrinsics.h
@@ -80,7 +80,7 @@ typedef uint32(*Intrinsic)(const uint8 *args, unsigned int argsize);
#define ARG_STRING(x) ARG_UC_PTR(ucptr_##x); \
uint16 id_##x = UCMachine::ptrToObject(ucptr_##x); \
- Std::string x = UCMachine::get_instance()->getString(id_##x);
+ Common::String x = UCMachine::get_instance()->getString(id_##x);
#define ARG_LIST(x) ARG_UINT16(id_##x); \
UCList* x = UCMachine::get_instance()->getList(id_##x);
diff --git a/engines/ultima/ultima8/usecode/uc_list.cpp b/engines/ultima/ultima8/usecode/uc_list.cpp
index ee22df36b35..9d0c57fc111 100644
--- a/engines/ultima/ultima8/usecode/uc_list.cpp
+++ b/engines/ultima/ultima8/usecode/uc_list.cpp
@@ -31,7 +31,7 @@ uint16 UCList::getStringIndex(uint32 index) const {
return _elements[index * 2] + (_elements[index * 2 + 1] << 8);
}
-const Std::string &UCList::getString(uint32 index) const {
+const Common::String &UCList::getString(uint32 index) const {
uint16 sindex = getStringIndex(index);
return UCMachine::get_instance()->getString(sindex);
}
@@ -77,7 +77,7 @@ void UCList::subtractStringList(const UCList &l) {
}
bool UCList::stringInList(uint16 s) const {
- Std::string str = UCMachine::get_instance()->getString(s);
+ Common::String str = UCMachine::get_instance()->getString(s);
for (unsigned int i = 0; i < _size; i++)
if (getString(i) == str)
return true;
@@ -97,7 +97,7 @@ void UCList::assignString(uint32 index, uint16 str) {
void UCList::removeString(uint16 s, bool nodel) {
// do we need to erase all occurrences of str or just the first one?
// (deleting all, currently)
- const Std::string &str = UCMachine::get_instance()->getString(s);
+ const Common::String &str = UCMachine::get_instance()->getString(s);
for (unsigned int i = 0; i < _size; i++) {
if (getString(i) == str) {
// free string
diff --git a/engines/ultima/ultima8/usecode/uc_list.h b/engines/ultima/ultima8/usecode/uc_list.h
index 530019438a8..9a4cd02ea7a 100644
--- a/engines/ultima/ultima8/usecode/uc_list.h
+++ b/engines/ultima/ultima8/usecode/uc_list.h
@@ -23,7 +23,7 @@
#define ULTIMA8_USECODE_UCLIST_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
@@ -169,7 +169,7 @@ public:
bool load(Common::ReadStream *rs, uint32 version);
private:
- const Std::string &getString(uint32 index) const;
+ const Common::String &getString(uint32 index) const;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index cefd16c28b7..a858d433b96 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -2010,10 +2010,10 @@ void UCMachine::execProcess(UCProcess *p) {
}
-const Std::string &UCMachine::getString(uint16 str) const {
- static const Std::string emptystring("");
+const Common::String &UCMachine::getString(uint16 str) const {
+ static const Common::String emptystring("");
- Common::HashMap<uint16, Std::string>::const_iterator iter =
+ Common::HashMap<uint16, Common::String>::const_iterator iter =
_stringHeap.find(str);
if (iter != _stringHeap.end())
@@ -2062,7 +2062,7 @@ void UCMachine::freeString(uint16 s) {
//! (when something accesses _stringHeap[0])
//! This may not be desirable, but OTOH the created string will be
//! empty, so not too much of a problem.
- Common::HashMap<uint16, Std::string>::iterator iter = _stringHeap.find(s);
+ Common::HashMap<uint16, Common::String>::iterator iter = _stringHeap.find(s);
if (iter != _stringHeap.end()) {
_stringHeap.erase(iter);
_stringIDs->clearID(s);
diff --git a/engines/ultima/ultima8/usecode/uc_machine.h b/engines/ultima/ultima8/usecode/uc_machine.h
index cd5828e4f15..f65e8da5d95 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.h
+++ b/engines/ultima/ultima8/usecode/uc_machine.h
@@ -24,7 +24,7 @@
#include "ultima/ultima8/misc/common_types.h"
#include "ultima/ultima8/misc/set.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/shared/std/containers.h"
#include "ultima/ultima8/usecode/intrinsics.h"
@@ -53,7 +53,7 @@ public:
void execProcess(UCProcess *proc);
- const Std::string &getString(uint16 str) const;
+ const Common::String &getString(uint16 str) const;
UCList *getList(uint16 l);
void freeString(uint16 s);
@@ -102,7 +102,7 @@ private:
GlobalStorage *_globals;
Common::HashMap<uint16, UCList *> _listHeap;
- Common::HashMap<uint16, Std::string> _stringHeap;
+ Common::HashMap<uint16, Common::String> _stringHeap;
// Add a string to the list (copies the string)
uint16 assignString(const char *str);
diff --git a/engines/ultima/ultima8/world/actors/combat_dat.h b/engines/ultima/ultima8/world/actors/combat_dat.h
index 77b59fa67cb..0720bd56b6d 100644
--- a/engines/ultima/ultima8/world/actors/combat_dat.h
+++ b/engines/ultima/ultima8/world/actors/combat_dat.h
@@ -24,7 +24,7 @@
#include "common/stream.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
@@ -44,7 +44,7 @@ public:
~CombatDat();
- const Std::string &getName() const {
+ const Common::String &getName() const {
return _name;
};
@@ -62,7 +62,7 @@ public:
}
private:
- Std::string _name;
+ Common::String _name;
uint16 _offsets[4];
uint8 *_data;
diff --git a/engines/ultima/ultima8/world/actors/main_actor.h b/engines/ultima/ultima8/world/actors/main_actor.h
index c2e3d996aac..a0800b95341 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.h
+++ b/engines/ultima/ultima8/world/actors/main_actor.h
@@ -111,10 +111,10 @@ public:
ProcId die(uint16 damageType, uint16 damagePts, Direction srcDir) override;
- const Std::string &getName() const {
+ const Common::String &getName() const {
return _name;
}
- void setName(const Std::string &name) {
+ void setName(const Common::String &name) {
_name = name;
}
@@ -199,7 +199,7 @@ protected:
CruBatteryType _cruBatteryType;
uint16 _activeInvItem;
- Std::string _name;
+ Common::String _name;
//! Process for a shield zap animation sprite
uint16 _shieldSpriteProc;
diff --git a/engines/ultima/ultima8/world/actors/npc_dat.h b/engines/ultima/ultima8/world/actors/npc_dat.h
index bf0322611cd..974d107d318 100644
--- a/engines/ultima/ultima8/world/actors/npc_dat.h
+++ b/engines/ultima/ultima8/world/actors/npc_dat.h
@@ -22,7 +22,7 @@
#ifndef WORLD_ACTORS_NPC_DAT_H
#define WORLD_ACTORS_NPC_DAT_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
#include "ultima/ultima8/filesys/raw_archive.h"
namespace Ultima {
@@ -34,7 +34,7 @@ public:
static Std::vector<NPCDat *> load(RawArchive *archive);
- const Std::string &getName() const {
+ const Common::String &getName() const {
return _name;
};
@@ -69,7 +69,7 @@ public:
private:
NPCDat(Common::SeekableReadStream &datars, Common::SeekableReadStream &namers);
- Std::string _name;
+ Common::String _name;
uint16 _minHp;
uint16 _maxHp;
uint16 _shapeNo;
diff --git a/engines/ultima/ultima8/world/actors/treasure_info.h b/engines/ultima/ultima8/world/actors/treasure_info.h
index 2db781c17fa..d4a1a7bb632 100644
--- a/engines/ultima/ultima8/world/actors/treasure_info.h
+++ b/engines/ultima/ultima8/world/actors/treasure_info.h
@@ -23,13 +23,13 @@
#define WORLD_ACTORS_TREASUREINFO_H
#include "ultima/shared/std/containers.h"
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
struct TreasureInfo {
- Std::string _special;
+ Common::String _special;
double _chance;
int _map;
Std::vector<uint32> _shapes;
diff --git a/engines/ultima/ultima8/world/damage_info.h b/engines/ultima/ultima8/world/damage_info.h
index 1d5fa1c72b3..ec71c39eded 100644
--- a/engines/ultima/ultima8/world/damage_info.h
+++ b/engines/ultima/ultima8/world/damage_info.h
@@ -22,7 +22,7 @@
#ifndef WORLD_DAMAGE_INFO_H
#define WORLD_DAMAGE_INFO_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index e7c5694c1fd..d617f772de9 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -2030,7 +2030,7 @@ void Item::clearGump() {
_flags &= ~FLG_GUMP_OPEN;
}
-ProcId Item::bark(const Std::string &msg) {
+ProcId Item::bark(const Common::String &msg) {
closeBark();
uint32 shapenum = getShape();
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index 0ab8066a97c..7663ebd81e8 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -268,7 +268,7 @@ public:
//! Close this Item's gump, if any
void closeGump();
- ProcId bark(const Std::string &msg);
+ ProcId bark(const Common::String &msg);
//! Call this to notify the Item's open bark has closed.
void clearBark(); // set bark to 0
//! Close this Item's bark, if any
diff --git a/engines/ultima/ultima8/world/target_reticle_process.cpp b/engines/ultima/ultima8/world/target_reticle_process.cpp
index 5b4189d637f..cb43cdc7861 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.cpp
+++ b/engines/ultima/ultima8/world/target_reticle_process.cpp
@@ -195,7 +195,7 @@ void TargetReticleProcess::clearSprite() {
void TargetReticleProcess::toggle() {
bool newstate = !getEnabled();
- Std::string msg = newstate ? _TL_("TARGETING RETICLE ACTIVE") : _TL_("TARGETING RETICLE INACTIVE");
+ Common::String msg = newstate ? _TL_("TARGETING RETICLE ACTIVE") : _TL_("TARGETING RETICLE INACTIVE");
MessageBoxGump::Show("", msg, TEX32_PACK_RGB(0x70, 0x70, 0x70));
setEnabled(newstate);
}
diff --git a/engines/ultima/ultima8/world/weapon_info.h b/engines/ultima/ultima8/world/weapon_info.h
index 8758e7bf04c..9e2ca0317dd 100644
--- a/engines/ultima/ultima8/world/weapon_info.h
+++ b/engines/ultima/ultima8/world/weapon_info.h
@@ -22,13 +22,13 @@
#ifndef ULTIMA8_WORLD_WEAPONINFO_H
#define ULTIMA8_WORLD_WEAPONINFO_H
-#include "ultima/shared/std/string.h"
+#include "common/str.h"
namespace Ultima {
namespace Ultima8 {
struct WeaponInfo {
- Std::string _name;
+ Common::String _name;
uint32 _shape;
uint8 _overlayType;
uint32 _overlayShape;
Commit: 922976fa6707d8f0f6caa25ceed13585ddaaed72
https://github.com/scummvm/scummvm/commit/922976fa6707d8f0f6caa25ceed13585ddaaed72
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-02-07T16:48:36+02:00
Commit Message:
ULTIMA: Replace Std::list with Common::List
Changed paths:
engines/ultima/nuvie/actors/actor.h
engines/ultima/nuvie/actors/actor_manager.cpp
engines/ultima/nuvie/actors/u6_actor.cpp
engines/ultima/nuvie/core/anim_manager.h
engines/ultima/nuvie/core/converse_speech.h
engines/ultima/nuvie/core/effect.cpp
engines/ultima/nuvie/core/egg_manager.cpp
engines/ultima/nuvie/core/egg_manager.h
engines/ultima/nuvie/core/obj_manager.cpp
engines/ultima/nuvie/core/obj_manager.h
engines/ultima/nuvie/core/timed_event.cpp
engines/ultima/nuvie/core/timed_event.h
engines/ultima/nuvie/core/weather.h
engines/ultima/nuvie/files/nuvie_file_list.cpp
engines/ultima/nuvie/files/nuvie_file_list.h
engines/ultima/nuvie/gui/gui_console.h
engines/ultima/nuvie/gui/gui_scroller.cpp
engines/ultima/nuvie/gui/widgets/converse_gump.cpp
engines/ultima/nuvie/gui/widgets/converse_gump.h
engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
engines/ultima/nuvie/gui/widgets/gui_widget.h
engines/ultima/nuvie/gui/widgets/map_window.cpp
engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
engines/ultima/nuvie/gui/widgets/msg_scroll.h
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
engines/ultima/nuvie/pathfinder/astar_path.cpp
engines/ultima/nuvie/pathfinder/astar_path.h
engines/ultima/nuvie/script/script_cutscene.cpp
engines/ultima/nuvie/script/script_cutscene.h
engines/ultima/nuvie/sound/sound.h
engines/ultima/nuvie/sound/sound_manager.cpp
engines/ultima/nuvie/sound/sound_manager.h
engines/ultima/nuvie/usecode/u6_usecode.cpp
engines/ultima/nuvie/views/scroll_widget_gump.cpp
engines/ultima/nuvie/views/scroll_widget_gump.h
engines/ultima/nuvie/views/view_manager.h
engines/ultima/shared/std/containers.h
engines/ultima/ultima8/audio/audio_process.cpp
engines/ultima/ultima8/audio/audio_process.h
engines/ultima/ultima8/gfx/fonts/font.cpp
engines/ultima/ultima8/gfx/fonts/font.h
engines/ultima/ultima8/gfx/fonts/jp_font.cpp
engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
engines/ultima/ultima8/gfx/fonts/shape_font.cpp
engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
engines/ultima/ultima8/gfx/fonts/tt_font.cpp
engines/ultima/ultima8/gumps/container_gump.cpp
engines/ultima/ultima8/gumps/game_map_gump.cpp
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/gump.h
engines/ultima/ultima8/kernel/kernel.h
engines/ultima/ultima8/kernel/mouse.cpp
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/usecode/uc_process.h
engines/ultima/ultima8/world/actors/animation_tracker.cpp
engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/container.h
engines/ultima/ultima8/world/current_map.cpp
engines/ultima/ultima8/world/current_map.h
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/map.cpp
engines/ultima/ultima8/world/map.h
engines/ultima/ultima8/world/minimap.cpp
engines/ultima/ultima8/world/missile_tracker.cpp
engines/ultima/ultima8/world/snap_process.cpp
engines/ultima/ultima8/world/snap_process.h
engines/ultima/ultima8/world/sort_item.h
engines/ultima/ultima8/world/super_sprite_process.cpp
engines/ultima/ultima8/world/world.cpp
engines/ultima/ultima8/world/world.h
diff --git a/engines/ultima/nuvie/actors/actor.h b/engines/ultima/nuvie/actors/actor.h
index 4599cdbd275..53b5bc44861 100644
--- a/engines/ultima/nuvie/actors/actor.h
+++ b/engines/ultima/nuvie/actors/actor.h
@@ -31,7 +31,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
using Std::vector;
#define ACTOR_NO_READIABLE_LOCATION -1
@@ -296,7 +295,7 @@ protected:
//current schedule pos;
uint16 sched_pos;
- list<Obj *> surrounding_objects; //used for multi-tile actors.
+ Common::List<Obj *> surrounding_objects; //used for multi-tile actors.
Common::HashMap<uint16, uint16> *custom_tile_tbl;
public:
@@ -579,7 +578,7 @@ public:
void clear_error();
ActorError *get_error();
- const list<Obj *> &get_surrounding_obj_list() const {
+ const Common::List<Obj *> &get_surrounding_obj_list() const {
return surrounding_objects;
}
void add_surrounding_obj(Obj *obj);
diff --git a/engines/ultima/nuvie/actors/actor_manager.cpp b/engines/ultima/nuvie/actors/actor_manager.cpp
index f6e59143771..0eb97e66f77 100644
--- a/engines/ultima/nuvie/actors/actor_manager.cpp
+++ b/engines/ultima/nuvie/actors/actor_manager.cpp
@@ -1169,8 +1169,8 @@ Std::vector<Common::String> ActorManager::getCustomTileFilenames(const Common::P
path.joinInPlace(datadir);
filelistSaveGameDir.open(path, filenamePrefix.c_str(), NUVIE_SORT_NAME_ASC);
- const Std::list<NuvieFileDesc> &files = filelistSaveGameDir.get_filelist();
- const Std::list<NuvieFileDesc> &dataFiles = filelistDataDir.get_filelist();
+ const Common::List<NuvieFileDesc> &files = filelistSaveGameDir.get_filelist();
+ const Common::List<NuvieFileDesc> &dataFiles = filelistDataDir.get_filelist();
Common::EqualTo<Common::String> comparitor;
Std::vector<Common::String> filenames;
diff --git a/engines/ultima/nuvie/actors/u6_actor.cpp b/engines/ultima/nuvie/actors/u6_actor.cpp
index c4bce764f3b..44b83b70f98 100644
--- a/engines/ultima/nuvie/actors/u6_actor.cpp
+++ b/engines/ultima/nuvie/actors/u6_actor.cpp
@@ -705,7 +705,7 @@ bool U6Actor::weapon_can_hit(const CombatType *weapon, Actor *target, uint16 *hi
return true;
}
- const Std::list<Obj *> &surrounding_objs = target->get_surrounding_obj_list();
+ const Common::List<Obj *> &surrounding_objs = target->get_surrounding_obj_list();
for (Obj *obj : surrounding_objs) {
if (Actor::weapon_can_hit(weapon, obj->x, obj->y)) {
*hit_x = obj->x;
@@ -1066,7 +1066,7 @@ inline void U6Actor::move_silver_serpent_objs_relative(sint16 rel_x, sint16 rel_
if (surrounding_objects.empty())
return;
- Std::list<Obj *>::iterator obj = surrounding_objects.begin();
+ Common::List<Obj *>::iterator obj = surrounding_objects.begin();
sint8 new_pos = 2 + rel_x + (rel_y * 2);
@@ -1131,7 +1131,7 @@ inline void U6Actor::set_direction_of_surrounding_objs(NuvieDir new_direction) {
}
inline void U6Actor::set_direction_of_surrounding_ship_objs(NuvieDir new_direction) {
- Std::list<Obj *>::iterator obj = surrounding_objects.begin();
+ Common::List<Obj *>::iterator obj = surrounding_objects.begin();
if (obj == surrounding_objects.end())
return;
@@ -1268,7 +1268,7 @@ inline void U6Actor::set_direction_of_surrounding_splitactor_objs(NuvieDir new_d
}
inline void U6Actor::set_direction_of_surrounding_dragon_objs(NuvieDir new_direction) {
- Std::list<Obj *>::iterator obj;
+ Common::List<Obj *>::iterator obj;
uint8 frame_offset = (new_direction * actor_type->tiles_per_direction + actor_type->tiles_per_frame - 1);
Obj *head, *tail, *wing1, *wing2;
@@ -1351,7 +1351,7 @@ inline void U6Actor::twitch_surrounding_dragon_objs() {
}
inline void U6Actor::twitch_surrounding_hydra_objs() {
- Std::list<Obj *>::iterator obj;
+ Common::List<Obj *>::iterator obj;
int i;
//Note! list order is important here. As it corresponds to the frame order in the tile set. This is defined in init_hydra()
diff --git a/engines/ultima/nuvie/core/anim_manager.h b/engines/ultima/nuvie/core/anim_manager.h
index 1ff0a36b800..e1eea9fa508 100644
--- a/engines/ultima/nuvie/core/anim_manager.h
+++ b/engines/ultima/nuvie/core/anim_manager.h
@@ -32,7 +32,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
using Std::vector;
class Actor;
@@ -44,7 +43,7 @@ class Font;
#define MESG_TIMED CB_TIMED
-typedef Std::list<NuvieAnim *>::iterator AnimIterator;
+typedef Common::List<NuvieAnim *>::iterator AnimIterator;
/* Each viewable area has it's own AnimManager. (but I can only think of
* animations in the MapWindow using this, so that could very well change)
@@ -53,7 +52,7 @@ class AnimManager {
MapWindow *map_window;
Screen *viewsurf;
Common::Rect viewport; // clip anims to location
- Std::list<NuvieAnim *> anim_list; // in paint order
+ Common::List<NuvieAnim *> anim_list; // in paint order
uint32 next_id;
uint8 tile_pitch;
diff --git a/engines/ultima/nuvie/core/converse_speech.h b/engines/ultima/nuvie/core/converse_speech.h
index d0277486a35..9217223295f 100644
--- a/engines/ultima/nuvie/core/converse_speech.h
+++ b/engines/ultima/nuvie/core/converse_speech.h
@@ -42,7 +42,7 @@ class ConverseSpeech {
// game system objects from nuvie
const Configuration *config;
Audio::SoundHandle handle;
- Std::list<TownsSound> list;
+ Common::List<TownsSound> list;
public:
ConverseSpeech();
diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index b89412549bb..c927383b63e 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -1318,7 +1318,7 @@ void TileFadeEffect::add_actor_anim() {
Tile *from = actor->get_tile();
add_tile_anim(loc, from);
- const Std::list<Obj *> &surrounding_objs = actor->get_surrounding_obj_list();
+ const Common::List<Obj *> &surrounding_objs = actor->get_surrounding_obj_list();
for (Obj *obj : surrounding_objs)
add_obj_anim(obj);
}
@@ -1419,7 +1419,7 @@ void TileBlackFadeEffect::add_actor_anim() {
Tile *from = actor->get_tile();
add_tile_anim(loc, from);
- const Std::list<Obj *> &surrounding_objs = actor->get_surrounding_obj_list();
+ const Common::List<Obj *> &surrounding_objs = actor->get_surrounding_obj_list();
for (Obj *o : surrounding_objs)
add_obj_anim(o);
}
diff --git a/engines/ultima/nuvie/core/egg_manager.cpp b/engines/ultima/nuvie/core/egg_manager.cpp
index a8740b6e755..1f98b1ca857 100644
--- a/engines/ultima/nuvie/core/egg_manager.cpp
+++ b/engines/ultima/nuvie/core/egg_manager.cpp
@@ -61,7 +61,7 @@ EggManager::~EggManager() {
}
void EggManager::clean(bool keep_obj) {
- Std::list<Egg *>::iterator egg_iter;
+ Common::List<Egg *>::iterator egg_iter;
for (egg_iter = egg_list.begin(); egg_iter != egg_list.end();) {
//egg = *egg_iter;
@@ -92,7 +92,7 @@ void EggManager::add_egg(Obj *egg_obj) {
void EggManager::remove_egg(Obj *egg_obj, bool keep_obj) {
- Std::list<Egg *>::iterator egg_iter;
+ Common::List<Egg *>::iterator egg_iter;
for (egg_iter = egg_list.begin(); egg_iter != egg_list.end(); egg_iter++) {
if ((*egg_iter)->obj == egg_obj) {
diff --git a/engines/ultima/nuvie/core/egg_manager.h b/engines/ultima/nuvie/core/egg_manager.h
index 210ac69ba6c..da1a0d1eacc 100644
--- a/engines/ultima/nuvie/core/egg_manager.h
+++ b/engines/ultima/nuvie/core/egg_manager.h
@@ -47,7 +47,7 @@ class EggManager {
ObjManager *obj_manager;
nuvie_game_t gametype; // what game is being played?
- Std::list<Egg *> egg_list;
+ Common::List<Egg *> egg_list;
public:
@@ -68,7 +68,7 @@ public:
void set_egg_visibility(bool show_eggs);
bool spawn_egg(Obj *egg, uint8 hatch_probability);
void spawn_eggs(uint16 x, uint16 y, uint8 z, bool teleport = false);
- Std::list<Egg *> *get_egg_list() {
+ Common::List<Egg *> *get_egg_list() {
return &egg_list;
};
bool is_spawning_actors() const {
diff --git a/engines/ultima/nuvie/core/obj_manager.cpp b/engines/ultima/nuvie/core/obj_manager.cpp
index 06aa90d2a09..11669f6fdaf 100644
--- a/engines/ultima/nuvie/core/obj_manager.cpp
+++ b/engines/ultima/nuvie/core/obj_manager.cpp
@@ -233,7 +233,7 @@ bool ObjManager::save_eggs(NuvieIO *save_buf) {
//skip number of objects we will fill that in at the end.
save_buf->write2(0);
- Std::list<Egg *> *egg_list = egg_manager->get_egg_list();
+ Common::List<Egg *> *egg_list = egg_manager->get_egg_list();
obj_save_count = 0;
@@ -1631,7 +1631,7 @@ void ObjManager::remove_temp_obj(Obj *tmp_obj) {
// clean objects from a whole level.
void ObjManager::temp_obj_list_clean_level(uint8 z) {
- Std::list<Obj *>::iterator obj;
+ Common::List<Obj *>::iterator obj;
for (obj = temp_obj_list.begin(); obj != temp_obj_list.end();) {
if ((*obj)->z == z) {
@@ -1647,7 +1647,7 @@ void ObjManager::temp_obj_list_clean_level(uint8 z) {
// Clean objects more than 19 tiles from position
void ObjManager::temp_obj_list_clean_area(uint16 x, uint16 y) {
- Std::list<Obj *>::iterator obj;
+ Common::List<Obj *>::iterator obj;
for (obj = temp_obj_list.begin(); obj != temp_obj_list.end();) {
sint16 dist_x = abs((sint16)(*obj)->x - x);
diff --git a/engines/ultima/nuvie/core/obj_manager.h b/engines/ultima/nuvie/core/obj_manager.h
index 70a95a6afea..c1a5534c3d2 100644
--- a/engines/ultima/nuvie/core/obj_manager.h
+++ b/engines/ultima/nuvie/core/obj_manager.h
@@ -91,8 +91,8 @@ class ObjManager {
UseCode *usecode;
- Std::list<Obj *> temp_obj_list;
- Std::list<Obj *> tile_obj_list; // SE single instance 'map tile' objects
+ Common::List<Obj *> temp_obj_list;
+ Common::List<Obj *> tile_obj_list; // SE single instance 'map tile' objects
uint16 last_obj_blk_x, last_obj_blk_y;
uint8 last_obj_blk_z;
diff --git a/engines/ultima/nuvie/core/timed_event.cpp b/engines/ultima/nuvie/core/timed_event.cpp
index bbd944d8710..ff870496204 100644
--- a/engines/ultima/nuvie/core/timed_event.cpp
+++ b/engines/ultima/nuvie/core/timed_event.cpp
@@ -75,7 +75,7 @@ void TimeQueue::add_timer(TimedEvent *tevent) {
// in case it's already queued, remove the earlier instance(s)
remove_timer(tevent);
// add after events with earlier/equal time
- Std::list<TimedEvent *>::iterator t = tq.begin();
+ Common::List<TimedEvent *>::iterator t = tq.begin();
while (t != tq.end() && (*t)->time <= tevent->time) t++;
tq.insert(t, tevent);
}
@@ -84,7 +84,7 @@ void TimeQueue::add_timer(TimedEvent *tevent) {
/* Remove timed event from queue.
*/
void TimeQueue::remove_timer(TimedEvent *tevent) {
- Std::list<TimedEvent *>::iterator t = tq.begin();
+ Common::List<TimedEvent *>::iterator t = tq.begin();
while (t != tq.end()) {
if (*t == tevent) {
t = tq.erase(t);
diff --git a/engines/ultima/nuvie/core/timed_event.h b/engines/ultima/nuvie/core/timed_event.h
index c522e53b06e..24bdd8dbd11 100644
--- a/engines/ultima/nuvie/core/timed_event.h
+++ b/engines/ultima/nuvie/core/timed_event.h
@@ -43,7 +43,7 @@ class TimedEvent;
/* A queue for our events.
*/
class TimeQueue {
- Std::list<TimedEvent *> tq;
+ Common::List<TimedEvent *> tq;
public:
TimeQueue() : tq() { }
~TimeQueue() {
diff --git a/engines/ultima/nuvie/core/weather.h b/engines/ultima/nuvie/core/weather.h
index 918172a435c..cf9ab1132e7 100644
--- a/engines/ultima/nuvie/core/weather.h
+++ b/engines/ultima/nuvie/core/weather.h
@@ -35,8 +35,6 @@ class CallBack;
class GameClock;
class GameTimedCallback;
-using Std::list;
-
//our callbacks
#define WEATHER_CB_CHANGE_WIND_DIR 1
@@ -49,7 +47,7 @@ class Weather: public CallBack {
nuvie_game_t gametype; // what game is being played?
NuvieDir wind_dir;
- Std::list<CallBack *>wind_change_notification_list;
+ Common::List<CallBack *>wind_change_notification_list;
GameTimedCallback *wind_timer;
diff --git a/engines/ultima/nuvie/files/nuvie_file_list.cpp b/engines/ultima/nuvie/files/nuvie_file_list.cpp
index 221d299958b..4f8bdb7c534 100644
--- a/engines/ultima/nuvie/files/nuvie_file_list.cpp
+++ b/engines/ultima/nuvie/files/nuvie_file_list.cpp
@@ -75,7 +75,7 @@ bool NuvieFileList::add_filename(const Common::String &fileName) {
}
const Common::String *NuvieFileList::get_latest() const {
- Std::list<NuvieFileDesc>::const_iterator iter;
+ Common::List<NuvieFileDesc>::const_iterator iter;
iter = file_list.begin();
@@ -94,7 +94,7 @@ void NuvieFileList::close() {
return;
}
-const Std::list<NuvieFileDesc> &NuvieFileList::get_filelist() const {
+const Common::List<NuvieFileDesc> &NuvieFileList::get_filelist() const {
return file_list;
}
diff --git a/engines/ultima/nuvie/files/nuvie_file_list.h b/engines/ultima/nuvie/files/nuvie_file_list.h
index 725bf790164..0795f766e4a 100644
--- a/engines/ultima/nuvie/files/nuvie_file_list.h
+++ b/engines/ultima/nuvie/files/nuvie_file_list.h
@@ -28,8 +28,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
-
#define NUVIE_SORT_TIME_DESC 0x1
#define NUVIE_SORT_TIME_ASC 0x2
@@ -53,7 +51,7 @@ public:
class NuvieFileList {
protected:
- Std::list<NuvieFileDesc> file_list;
+ Common::List<NuvieFileDesc> file_list;
uint8 sort_mode;
protected:
@@ -69,7 +67,7 @@ public:
const Common::String *get_latest() const;
uint32 get_num_files() const;
- const Std::list<NuvieFileDesc> &get_filelist() const;
+ const Common::List<NuvieFileDesc> &get_filelist() const;
void close();
};
diff --git a/engines/ultima/nuvie/gui/gui_console.h b/engines/ultima/nuvie/gui/gui_console.h
index b4e4af22366..195486851ce 100644
--- a/engines/ultima/nuvie/gui/gui_console.h
+++ b/engines/ultima/nuvie/gui/gui_console.h
@@ -38,7 +38,7 @@ class GUI_Console : public GUI_Widget {
GUI_Font *font;
uint16 num_cols;
uint16 num_rows;
- Std::list<Common::String> data;
+ Common::List<Common::String> data;
public:
GUI_Console(uint16 x, uint16 y, uint16 w, uint16 h);
diff --git a/engines/ultima/nuvie/gui/gui_scroller.cpp b/engines/ultima/nuvie/gui/gui_scroller.cpp
index b111c2d67f4..5531631e4eb 100644
--- a/engines/ultima/nuvie/gui/gui_scroller.cpp
+++ b/engines/ultima/nuvie/gui/gui_scroller.cpp
@@ -76,7 +76,7 @@ void GUI_Scroller::update_viewport(bool update_slider) {
scroll_bar->set_slider_position(s_pos);
}
- Std::list<GUI_Widget *>::iterator child = children.begin();
+ Common::List<GUI_Widget *>::iterator child = children.begin();
child++; // skip the scroll_bar widget. This is a bit evil.
for (i = 0; child != children.end(); child++, i++) {
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.cpp b/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
index 09cbe2f99cd..f34828c5514 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.cpp
@@ -451,7 +451,7 @@ void ConverseGump::add_keyword(const Common::String keyword_) {
Common::String ConverseGump::get_token_string_at_pos(uint16 x, uint16 y) {
uint16 total_length = 0;
uint16 tmp_y = area.top + portrait_height + 8 + 3 + 4;
- Std::list<MsgText>::iterator iter;
+ Common::List<MsgText>::iterator iter;
for (iter = keyword_list->begin(); iter != keyword_list->end(); iter++) {
MsgText t = *iter;
uint16 token_len = font->getStringWidth(t.s.c_str());
@@ -476,7 +476,7 @@ Common::String ConverseGump::get_token_string_at_pos(uint16 x, uint16 y) {
Common::String ConverseGump::get_token_at_cursor() {
uint16 i = 0;
- Std::list<MsgText>::iterator iter;
+ Common::List<MsgText>::iterator iter;
for (iter = keyword_list->begin(); iter != keyword_list->end(); i++, iter++) {
if (i == cursor_position) {
Common::String keyword = (*iter).s;
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.h b/engines/ultima/nuvie/gui/widgets/converse_gump.h
index 8d83003bd15..2f5e1edbe16 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.h
@@ -30,8 +30,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
-
class Configuration;
class Font;
@@ -39,10 +37,10 @@ class MsgScroll;
class Actor;
class ConverseGump: public MsgScroll {
- Std::list<MsgText> conv_keywords;
- Std::list<MsgText> permitted_input_keywords;
+ Common::List<MsgText> conv_keywords;
+ Common::List<MsgText> permitted_input_keywords;
- Std::list<MsgText> *keyword_list;
+ Common::List<MsgText> *keyword_list;
unsigned char *npc_portrait;
unsigned char *avatar_portrait;
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
index ad0bbd559e5..cdb2e16b92c 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
@@ -31,8 +31,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
-
class Configuration;
class Font;
class MsgScroll;
diff --git a/engines/ultima/nuvie/gui/widgets/gui_widget.h b/engines/ultima/nuvie/gui/widgets/gui_widget.h
index abdbf8b830f..fa666c99768 100644
--- a/engines/ultima/nuvie/gui/widgets/gui_widget.h
+++ b/engines/ultima/nuvie/gui/widgets/gui_widget.h
@@ -59,7 +59,7 @@ protected:
bool focused;
- Std::list<GUI_Widget *>children;
+ Common::List<GUI_Widget *>children;
GUI_Widget *parent;
char *errorptr;
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.cpp b/engines/ultima/nuvie/gui/widgets/map_window.cpp
index 8a40de4802d..dcf84baa6e8 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.cpp
+++ b/engines/ultima/nuvie/gui/widgets/map_window.cpp
@@ -948,7 +948,7 @@ inline void MapWindow::drawActor(const Actor *actor) {
drawTile(tile, wrapped_x, actor->y - cur_y, false);
drawTile(tile, wrapped_x, actor->y - cur_y, true);
if (game->get_clock()->get_timer(GAMECLOCK_TIMER_U6_INFRAVISION) != 0) {
- const Std::list<Obj *> &surrounding_objs = actor->get_surrounding_obj_list();
+ const Common::List<Obj *> &surrounding_objs = actor->get_surrounding_obj_list();
for (Obj *obj : surrounding_objs) {
const Tile *t = tile_manager->get_original_tile(obj_manager->get_obj_tile_num(obj->obj_n) + obj->frame_n);
uint16 wrapped_obj_x = WRAP_VIEWP(cur_x, obj->x, map_width);
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
index fa27f908091..ba7134a25b4 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.cpp
@@ -901,7 +901,7 @@ Common::String MsgScroll::get_token_string_at_pos(uint16 x, uint16 y) {
uint16 i;
sint32 buf_x, buf_y;
MsgText *token = nullptr;
- Std::list<MsgLine *>::iterator iter;
+ Common::List<MsgLine *>::iterator iter;
buf_x = (x - area.left) / 8;
buf_y = (y - area.top) / 8;
@@ -935,7 +935,7 @@ Common::String MsgScroll::get_token_string_at_pos(uint16 x, uint16 y) {
void MsgScroll::Display(bool full_redraw) {
uint16 i;
- Std::list<MsgLine *>::iterator iter;
+ Common::List<MsgLine *>::iterator iter;
MsgLine *msg_line = nullptr;
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.h b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
index 7a5be591b5c..dae59fccd00 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
@@ -44,8 +44,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
-
class Configuration;
class Font;
@@ -75,7 +73,7 @@ public:
class MsgLine {
public:
- Std::list<MsgText *> text;
+ Common::List<MsgText *> text;
uint32 total_length;
MsgLine() {
@@ -113,7 +111,7 @@ protected:
bool just_finished_page_break;
bool just_displayed_prompt;
virtual void process_page_break();
- Std::list<MsgLine *> msg_buf;
+ Common::List<MsgLine *> msg_buf;
Common::String input_buf;
bool permit_inputescape; // can RETURN or ESCAPE be used to escape input entry
@@ -134,7 +132,7 @@ private:
bool keyword_highlight;
MsgText prompt;
- Std::list<MsgText *> holding_buffer;
+ Common::List<MsgText *> holding_buffer;
bool show_cursor;
bool autobreak; // if true, a page break will be added when the scroll is full
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
index 6964be1916b..b5c5828e487 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.cpp
@@ -185,7 +185,7 @@ void MsgScrollNewUI::Display(bool full_redraw) {
uint16 y = area.top + 4;
uint16 total_length = 0;
- Std::list<MsgLine *>::iterator iter;
+ Common::List<MsgLine *>::iterator iter;
iter = msg_buf.begin();
for (uint16 i = 0; i < position && iter != msg_buf.end(); i++)
@@ -193,7 +193,7 @@ void MsgScrollNewUI::Display(bool full_redraw) {
for (uint16 i = 0; i < scroll_height && iter != msg_buf.end(); i++, iter++) {
MsgLine *msg_line = *iter;
- Std::list<MsgText *>::iterator iter1;
+ Common::List<MsgText *>::iterator iter1;
iter1 = msg_line->text.begin();
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
index 336332989b7..b795c673db8 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
@@ -30,8 +30,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
-
class Configuration;
class Font;
class MsgScroll;
diff --git a/engines/ultima/nuvie/pathfinder/astar_path.cpp b/engines/ultima/nuvie/pathfinder/astar_path.cpp
index 783cfdee06c..5b9c9170da0 100644
--- a/engines/ultima/nuvie/pathfinder/astar_path.cpp
+++ b/engines/ultima/nuvie/pathfinder/astar_path.cpp
@@ -172,7 +172,7 @@ void AStarPath::push_open_node(astar_node *node) {
return;
}
- Std::list<astar_node *>::iterator n = open_nodes.begin();
+ Common::List<astar_node *>::iterator n = open_nodes.begin();
// get to end of list or to a node with equal or greater score
while (n != open_nodes.end() && (*n++)->score < node->score);
open_nodes.insert(n, node); // and add before that location
@@ -191,7 +191,7 @@ astar_node *AStarPath::pop_open_node() {
* remove it from the list.
*/
void AStarPath::remove_closed_node(astar_node *ncmp) {
- Std::list<astar_node *>::iterator n;
+ Common::List<astar_node *>::iterator n;
for (n = closed_nodes.begin(); n != closed_nodes.end(); n++)
if ((*n)->loc == ncmp->loc) {
closed_nodes.erase(n);
diff --git a/engines/ultima/nuvie/pathfinder/astar_path.h b/engines/ultima/nuvie/pathfinder/astar_path.h
index e2a6280607a..03fe8352b96 100644
--- a/engines/ultima/nuvie/pathfinder/astar_path.h
+++ b/engines/ultima/nuvie/pathfinder/astar_path.h
@@ -41,7 +41,7 @@ typedef struct astar_node_s {
/* Provides A* search and cost methods for PathFinder and subclasses.
*/class AStarPath: public Path {
protected:
- Std::list<astar_node *> open_nodes, closed_nodes; // nodes seen
+ Common::List<astar_node *> open_nodes, closed_nodes; // nodes seen
astar_node *final_node; // last node in path search, used by create_path()
/* Forms a usable path from results of a search. */
void create_path();
diff --git a/engines/ultima/nuvie/script/script_cutscene.cpp b/engines/ultima/nuvie/script/script_cutscene.cpp
index b4017f197a1..0e14e862fe8 100644
--- a/engines/ultima/nuvie/script/script_cutscene.cpp
+++ b/engines/ultima/nuvie/script/script_cutscene.cpp
@@ -1486,7 +1486,7 @@ void ScriptCutscene::print_text(CSImage *image, const char *s, uint16 *x, uint16
size_t start = 0;
size_t found;
Common::String str = s;
- Std::list<Common::String> tokens;
+ Common::List<Common::String> tokens;
int space_width = font->getStringWidth(" ");
//uint16 x1 = startx;
@@ -1714,7 +1714,7 @@ void ScriptCutscene::display_wrapped_text(CSSprite *s) {
size_t start = 0;
size_t found;
Common::String str = s->text + "^";
- Std::list<Common::String> tokens;
+ Common::List<Common::String> tokens;
int y = s->y;
@@ -1738,7 +1738,7 @@ int ScriptCutscene::display_wrapped_text_line(Common::String str, uint8 text_col
size_t start = 0;
size_t found;
str = str + " ";
- Std::list<Common::String> tokens;
+ Common::List<Common::String> tokens;
int space_width = font->getStringWidth(" ");
//uint16 x1 = startx;
int width = 320 - x * 2;
diff --git a/engines/ultima/nuvie/script/script_cutscene.h b/engines/ultima/nuvie/script/script_cutscene.h
index 23616dcadef..47bc097734c 100644
--- a/engines/ultima/nuvie/script/script_cutscene.h
+++ b/engines/ultima/nuvie/script/script_cutscene.h
@@ -129,7 +129,7 @@ private:
Configuration *config;
GUI *gui;
Cursor *cursor;
- Std::list<CSSprite *> sprite_list; // in paint order
+ Common::List<CSSprite *> sprite_list; // in paint order
Screen *screen;
uint8 *palette;
SoundManager *sound_manager;
diff --git a/engines/ultima/nuvie/sound/sound.h b/engines/ultima/nuvie/sound/sound.h
index 22190e6171e..53fc2501d3b 100644
--- a/engines/ultima/nuvie/sound/sound.h
+++ b/engines/ultima/nuvie/sound/sound.h
@@ -29,7 +29,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
using Std::vector;
class Sound {
diff --git a/engines/ultima/nuvie/sound/sound_manager.cpp b/engines/ultima/nuvie/sound/sound_manager.cpp
index af236ef41a6..c137656d00b 100644
--- a/engines/ultima/nuvie/sound/sound_manager.cpp
+++ b/engines/ultima/nuvie/sound/sound_manager.cpp
@@ -628,7 +628,7 @@ void SoundManager::musicStop() {
}
}
-Std::list < SoundManagerSfx >::iterator SoundManagerSfx_find(Std::list < SoundManagerSfx >::iterator first, Std::list < SoundManagerSfx >::iterator last, const SfxIdType &value) {
+Common::List < SoundManagerSfx >::iterator SoundManagerSfx_find(Common::List < SoundManagerSfx >::iterator first, Common::List < SoundManagerSfx >::iterator last, const SfxIdType &value) {
for (; first != last; first++) {
if ((*first).sfx_id == value)
break;
@@ -721,7 +721,7 @@ void SoundManager::update_map_sfx() {
//DEBUG(1,LEVEL_DEBUGGING,"\n");
//is this sound new? - activate it.
for (i = 0; i < currentlyActiveSounds.size(); i++) {
- Std::list < SoundManagerSfx >::iterator it;
+ Common::List < SoundManagerSfx >::iterator it;
it = SoundManagerSfx_find(m_ActiveSounds.begin(), m_ActiveSounds.end(), currentlyActiveSounds[i]); //is the sound already active?
if (it == m_ActiveSounds.end()) {
//this is a new sound, add it to the active list
@@ -735,7 +735,7 @@ void SoundManager::update_map_sfx() {
}
}
//is this sound old? - deactivate it
- Std::list < SoundManagerSfx >::iterator it;
+ Common::List < SoundManagerSfx >::iterator it;
it = m_ActiveSounds.begin();
while (it != m_ActiveSounds.end()) {
Std::vector<SfxIdType>::iterator fit;
diff --git a/engines/ultima/nuvie/sound/sound_manager.h b/engines/ultima/nuvie/sound/sound_manager.h
index fa493270006..dbe717c0b1c 100644
--- a/engines/ultima/nuvie/sound/sound_manager.h
+++ b/engines/ultima/nuvie/sound/sound_manager.h
@@ -154,14 +154,14 @@ private:
IntCollectionMap m_TileSampleMap;
IntCollectionMap m_ObjectSampleMap;
StringCollectionMap m_MusicMap;
- list<Sound *> m_Songs;
- list<Sound *> m_Samples;
+ Common::List<Sound *> m_Songs;
+ Common::List<Sound *> m_Samples;
const Configuration *m_Config;
//state info:
Common::String m_CurrentGroup;
Sound *m_pCurrentSong;
- list<SoundManagerSfx> m_ActiveSounds;
+ Common::List<SoundManagerSfx> m_ActiveSounds;
bool audio_enabled;
bool music_enabled;
bool speech_enabled;
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.cpp b/engines/ultima/nuvie/usecode/u6_usecode.cpp
index 5c05107d4cc..7a03ca3ca20 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.cpp
+++ b/engines/ultima/nuvie/usecode/u6_usecode.cpp
@@ -765,8 +765,8 @@ bool U6UseCode::use_rune(Obj *obj, UseCodeEvent ev) {
}
void U6UseCode::remove_gargoyle_egg(uint16 x, uint16 y, uint8 z) {
- Std::list<Egg *> *egg_list = game->get_egg_manager()->get_egg_list();
- Std::list<Egg *>::iterator egg_itr;
+ Common::List<Egg *> *egg_list = game->get_egg_manager()->get_egg_list();
+ Common::List<Egg *>::iterator egg_itr;
for (egg_itr = egg_list->begin(); egg_itr != egg_list->end();) {
Egg *egg = *egg_itr;
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.cpp b/engines/ultima/nuvie/views/scroll_widget_gump.cpp
index 6a0142fa279..885d4d3dcbc 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.cpp
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.cpp
@@ -111,7 +111,7 @@ void ScrollWidgetGump::Display(bool full_redraw) {
MsgText *token;
uint16 y = area.top + 4;
- Std::list<MsgLine *>::iterator iter;
+ Common::List<MsgLine *>::iterator iter;
if (show_up_arrow) {
font_normal->drawChar(screen, FONT_UP_ARROW_CHAR, area.left + SCROLLWIDGETGUMP_W - 8, area.top + 4);
@@ -127,7 +127,7 @@ void ScrollWidgetGump::Display(bool full_redraw) {
for (uint16 i = 0; i < scroll_height && iter != msg_buf.end(); i++, iter++) {
MsgLine *msg_line = *iter;
- Std::list<MsgText *>::iterator iter1;
+ Common::List<MsgText *>::iterator iter1;
iter1 = msg_line->text.begin();
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.h b/engines/ultima/nuvie/views/scroll_widget_gump.h
index 180d1ccd30f..b2ebc4ab48f 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.h
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.h
@@ -32,8 +32,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::list;
-
class Configuration;
class Actor;
diff --git a/engines/ultima/nuvie/views/view_manager.h b/engines/ultima/nuvie/views/view_manager.h
index b38af7ec9e2..8b8b933399f 100644
--- a/engines/ultima/nuvie/views/view_manager.h
+++ b/engines/ultima/nuvie/views/view_manager.h
@@ -48,8 +48,6 @@ class DraggableView;
class SunMoonRibbon;
class MDSkyStripWidget;
-using Std::list;
-
typedef enum { CURSOR_HEAD, CURSOR_NECK, CURSOR_CHEST, CURSOR_RIGHT_HAND, CURSOR_LEFT_HAND, CURSOR_RIGHT_RING, CURSOR_LEFT_RING, CURSOR_FEET,
CURSOR_LEFT, CURSOR_RIGHT, CURSOR_COMBAT, CURSOR_CHECK, CURSOR_HEART, CURSOR_PARTY, CURSOR_INVENTORY
} gumpCursorPos;
@@ -74,9 +72,9 @@ protected:
View *current_view;
- Std::list<DraggableView *> container_gumps;
- Std::list<DraggableView *> doll_gumps;
- Std::list<DraggableView *> gumps;
+ Common::List<DraggableView *> container_gumps;
+ Common::List<DraggableView *> doll_gumps;
+ Common::List<DraggableView *> gumps;
uint8 doll_next_party_member;
diff --git a/engines/ultima/shared/std/containers.h b/engines/ultima/shared/std/containers.h
index eadb8e0bdbf..936efb1e0dc 100644
--- a/engines/ultima/shared/std/containers.h
+++ b/engines/ultima/shared/std/containers.h
@@ -42,10 +42,6 @@ public:
vector(size_t newSize, const T elem) : Common::Array<T>(newSize, elem) {}
};
-template<class T>
-class list : public Common::List<T> {
-};
-
} // End of namespace Std
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/audio/audio_process.cpp b/engines/ultima/ultima8/audio/audio_process.cpp
index 2557b6f2ea6..2388d6ddf4f 100644
--- a/engines/ultima/ultima8/audio/audio_process.cpp
+++ b/engines/ultima/ultima8/audio/audio_process.cpp
@@ -87,7 +87,7 @@ void AudioProcess::run() {
AudioMixer *mixer = AudioMixer::get_instance();
// Update the channels
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
bool finished = false;
if (!mixer->isPlaying(it->_channel)) {
@@ -213,7 +213,7 @@ int AudioProcess::playSample(AudioSample *sample, int priority, int loops, bool
if (channel == -1) return channel;
// Erase old sample using channel (if any)
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_channel == channel) {
it = _sampleInfo.erase(it);
@@ -234,7 +234,7 @@ void AudioProcess::playSFX(int sfxNum, int priority, ObjId objId, int loops,
AudioMixer *mixer = AudioMixer::get_instance();
if (no_duplicates) {
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_sfxNum == sfxNum && it->_objId == objId &&
it->_loops == loops) {
@@ -271,7 +271,7 @@ void AudioProcess::playSFX(int sfxNum, int priority, ObjId objId, int loops,
void AudioProcess::stopSFX(int sfxNum, ObjId objId) {
AudioMixer *mixer = AudioMixer::get_instance();
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if ((sfxNum == -1 || it->_sfxNum == sfxNum)
&& it->_objId == objId) {
@@ -339,7 +339,7 @@ bool AudioProcess::playSpeech(const Common::String &barked, int shapeNum, ObjId
AudioMixer *mixer = AudioMixer::get_instance();
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_sfxNum == -1 && it->_barked == barked &&
@@ -387,7 +387,7 @@ uint32 AudioProcess::getSpeechLength(const Common::String &barked, int shapenum)
void AudioProcess::stopSpeech(const Common::String &barked, int shapenum, ObjId objId) {
AudioMixer *mixer = AudioMixer::get_instance();
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_sfxNum == -1 && it->_priority == shapenum &&
it->_objId == objId && it->_barked == barked) {
@@ -400,7 +400,7 @@ void AudioProcess::stopSpeech(const Common::String &barked, int shapenum, ObjId
}
bool AudioProcess::isSpeechPlaying(const Common::String &barked, int shapeNum) {
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (auto &si : _sampleInfo) {
if (si._sfxNum == -1 && si._priority == shapeNum &&
si._barked == barked) {
@@ -417,7 +417,7 @@ void AudioProcess::pauseAllSamples() {
AudioMixer *mixer = AudioMixer::get_instance();
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (mixer->isPlaying(it->_channel)) {
mixer->setPaused(it->_channel, true);
@@ -436,7 +436,7 @@ void AudioProcess::unpauseAllSamples() {
AudioMixer *mixer = AudioMixer::get_instance();
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (mixer->isPlaying(it->_channel)) {
mixer->setPaused(it->_channel, false);
@@ -452,7 +452,7 @@ void AudioProcess::unpauseAllSamples() {
void AudioProcess::stopAllExceptSpeech() {
AudioMixer *mixer = AudioMixer::get_instance();
- Std::list<SampleInfo>::iterator it;
+ Common::List<SampleInfo>::iterator it;
for (it = _sampleInfo.begin(); it != _sampleInfo.end();) {
if (it->_barked.empty()) {
if (mixer->isPlaying(it->_channel)) mixer->stopSample(it->_channel);
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index 058e7c22fe0..551c9454203 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -63,7 +63,7 @@ public:
_calcVol(cv), _balance(bal), _ambient(ambient) { }
};
- Std::list<SampleInfo> _sampleInfo;
+ Common::List<SampleInfo> _sampleInfo;
public:
// p_dynamic_class stuff
ENABLE_RUNTIME_CLASSTYPE()
diff --git a/engines/ultima/ultima8/gfx/fonts/font.cpp b/engines/ultima/ultima8/gfx/fonts/font.cpp
index 34ad96c904e..367cbe59fef 100644
--- a/engines/ultima/ultima8/gfx/fonts/font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font.cpp
@@ -40,7 +40,7 @@ void Font::getTextSize(const Common::String &text,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
bool u8specials, bool pagebreaks) {
- Std::list<PositionedText> tmp;
+ Common::List<PositionedText> tmp;
tmp = typesetText<Traits>(this, text, remaining,
width, height, align, u8specials, pagebreaks,
resultwidth, resultheight);
@@ -178,7 +178,7 @@ CHECKME: any others? (page breaks for books?)
*/
template<class T>
-Std::list<PositionedText> typesetText(Font *font,
+Common::List<PositionedText> typesetText(Font *font,
const Common::String &text, unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, bool pagebreaks, int32 &resultwidth,
int32 &resultheight, Common::String::size_type cursor) {
@@ -193,7 +193,7 @@ Std::list<PositionedText> typesetText(Font *font,
int totalwidth = 0;
int totalheight = 0;
- Std::list<PositionedText> lines;
+ Common::List<PositionedText> lines;
PositionedText line;
Common::String::const_iterator iter = text.begin();
@@ -366,14 +366,14 @@ Std::list<PositionedText> typesetText(Font *font,
// explicit instantiations
template
-Std::list<PositionedText> typesetText<Font::Traits>
+Common::List<PositionedText> typesetText<Font::Traits>
(Font *font, const Common::String &text,
unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, bool pagebreaks,
int32 &resultwidth, int32 &resultheight, Common::String::size_type cursor);
template
-Std::list<PositionedText> typesetText<Font::SJISTraits>
+Common::List<PositionedText> typesetText<Font::SJISTraits>
(Font *font, const Common::String &text,
unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, bool pagebreaks,
diff --git a/engines/ultima/ultima8/gfx/fonts/font.h b/engines/ultima/ultima8/gfx/fonts/font.h
index 186ed531068..6bf8f759d06 100644
--- a/engines/ultima/ultima8/gfx/fonts/font.h
+++ b/engines/ultima/ultima8/gfx/fonts/font.h
@@ -167,7 +167,7 @@ protected:
};
template<class T>
-Std::list<PositionedText> typesetText(Font *font,
+Common::List<PositionedText> typesetText(Font *font,
const Common::String &text, unsigned int &remaining,
int32 width, int32 height, Font::TextAlign align,
bool u8specials, bool pagebreaks,
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_font.cpp b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
index 8879dafff79..810268c80ee 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_font.cpp
@@ -79,7 +79,7 @@ void JPFont::getTextSize(const Common::String &text,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
bool u8specials, bool pagebreaks) {
- Std::list<PositionedText> tmp;
+ Common::List<PositionedText> tmp;
tmp = typesetText<SJISTraits>(this, text, remaining,
width, height, align, u8specials, pagebreaks,
resultwidth, resultheight);
@@ -91,7 +91,7 @@ RenderedText *JPFont::renderText(const Common::String &text,
bool u8specials, bool pagebreaks,
Common::String::size_type cursor) {
int32 resultwidth, resultheight;
- Std::list<PositionedText> lines;
+ Common::List<PositionedText> lines;
lines = typesetText<SJISTraits>(this, text, remaining,
width, height, align, u8specials, pagebreaks,
resultwidth, resultheight,
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
index 432460c828f..635cb1e22ec 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.cpp
@@ -31,7 +31,7 @@
namespace Ultima {
namespace Ultima8 {
-JPRenderedText::JPRenderedText(Std::list<PositionedText> &lines, int width, int height,
+JPRenderedText::JPRenderedText(Common::List<PositionedText> &lines, int width, int height,
int vLead, ShapeFont *font, unsigned int fontNum)
: _lines(lines), _font(font), _fontNum(fontNum) {
_width = width;
@@ -97,7 +97,7 @@ void JPRenderedText::drawBlended(RenderSurface *surface, int x, int y,
const Palette *savepal = _font->getPalette();
_font->setPalette(pal);
- Std::list<PositionedText>::const_iterator iter;
+ Common::List<PositionedText>::const_iterator iter;
for (const auto &line : _lines) {
int line_x = x + line._dims.left;
diff --git a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
index 2c01c6fcc09..19ef28dec69 100644
--- a/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/jp_rendered_text.h
@@ -32,7 +32,7 @@ class ShapeFont;
class JPRenderedText : public RenderedText {
public:
- JPRenderedText(Std::list<PositionedText> &lines,
+ JPRenderedText(Common::List<PositionedText> &lines,
int width, int height, int vlead, ShapeFont *font,
unsigned int fontnum);
~JPRenderedText() override;
@@ -41,7 +41,7 @@ public:
void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
protected:
- Std::list<PositionedText> _lines;
+ Common::List<PositionedText> _lines;
ShapeFont *_font;
unsigned int _fontNum;
};
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_font.cpp b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
index 5d9d618b8f3..0a666be481d 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_font.cpp
@@ -124,7 +124,7 @@ RenderedText *ShapeFont::renderText(const Common::String &text,
bool u8specials, bool pagebreaks,
Common::String::size_type cursor) {
int32 resultwidth, resultheight;
- Std::list<PositionedText> lines;
+ Common::List<PositionedText> lines;
lines = typesetText<Traits>(this, text, remaining,
width, height, align, u8specials, pagebreaks,
resultwidth, resultheight, cursor);
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
index c84aa1aa61e..140afc193ed 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.cpp
@@ -29,7 +29,7 @@
namespace Ultima {
namespace Ultima8 {
-ShapeRenderedText::ShapeRenderedText(const Std::list<PositionedText> &lines,
+ShapeRenderedText::ShapeRenderedText(const Common::List<PositionedText> &lines,
int width, int height, int vLead,
ShapeFont *font)
: _lines(lines), _font(font) {
@@ -45,7 +45,7 @@ void ShapeRenderedText::draw(RenderSurface *surface, int x, int y, bool /*destma
// TODO support masking here???
uint32 color = TEX32_PACK_RGB(0, 0, 0);
- Std::list<PositionedText>::const_iterator iter;
+ Common::List<PositionedText>::const_iterator iter;
surface->BeginPainting();
@@ -80,7 +80,7 @@ void ShapeRenderedText::drawBlended(RenderSurface *surface, int x, int y,
uint32 col, bool /*destmasked*/) {
// TODO Support masking here ????
- Std::list<PositionedText>::const_iterator iter;
+ Common::List<PositionedText>::const_iterator iter;
for (const auto &line : _lines) {
int line_x = x + line._dims.left;
diff --git a/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
index f54ec07be51..1f2b71ff689 100644
--- a/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
+++ b/engines/ultima/ultima8/gfx/fonts/shape_rendered_text.h
@@ -32,7 +32,7 @@ class ShapeFont;
class ShapeRenderedText : public RenderedText {
public:
- ShapeRenderedText(const Std::list<PositionedText> &lines,
+ ShapeRenderedText(const Common::List<PositionedText> &lines,
int width, int height, int vlead, ShapeFont *font);
~ShapeRenderedText() override;
@@ -40,7 +40,7 @@ public:
void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
protected:
- Std::list<PositionedText> _lines;
+ Common::List<PositionedText> _lines;
ShapeFont *_font;
};
diff --git a/engines/ultima/ultima8/gfx/fonts/tt_font.cpp b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
index 66f88af9542..9e5cc207f8c 100644
--- a/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/tt_font.cpp
@@ -111,7 +111,7 @@ void TTFont::getTextSize(const Common::String &text,
unsigned int &remaining,
int32 width, int32 height, TextAlign align,
bool u8specials, bool pagebreaks) {
- Std::list<PositionedText> tmp;
+ Common::List<PositionedText> tmp;
if (!_SJIS)
tmp = typesetText<Traits>(this, text, remaining,
width, height, align, u8specials, pagebreaks,
@@ -197,7 +197,7 @@ RenderedText *TTFont::renderText(const Common::String &text, unsigned int &remai
int32 width, int32 height, TextAlign align, bool u8specials, bool pagebreaks,
Common::String::size_type cursor) {
int32 resultWidth, resultHeight, lineHeight;
- Std::list<PositionedText> lines;
+ Common::List<PositionedText> lines;
if (!_SJIS)
lines = typesetText<Traits>(this, text, remaining, width, height, align, u8specials, pagebreaks,
resultWidth, resultHeight, cursor);
diff --git a/engines/ultima/ultima8/gumps/container_gump.cpp b/engines/ultima/ultima8/gumps/container_gump.cpp
index 1e8115a18e0..fbda1e67c7e 100644
--- a/engines/ultima/ultima8/gumps/container_gump.cpp
+++ b/engines/ultima/ultima8/gumps/container_gump.cpp
@@ -206,8 +206,8 @@ uint16 ContainerGump::TraceObjId(int32 mx, int32 my) {
bool showEditorItems = Ultima8Engine::get_instance()->isShowEditorItems();
- Std::list<Item *> &contents = c->_contents;
- Std::list<Item *>::iterator iter;
+ Common::List<Item *> &contents = c->_contents;
+ Common::List<Item *>::iterator iter;
// iterate backwards, since we're painting from begin() to end()
for (iter = contents.reverse_begin(); iter != contents.end(); --iter) {
@@ -290,8 +290,8 @@ void ContainerGump::Close(bool no_del) {
Container *c = getContainer(_owner);
if (!c) return; // Container gone!?
- Std::list<Item *> &contents = c->_contents;
- Std::list<Item *>::iterator iter = contents.begin();
+ Common::List<Item *> &contents = c->_contents;
+ Common::List<Item *>::iterator iter = contents.begin();
while (iter != contents.end()) {
Item *item = *iter;
++iter;
diff --git a/engines/ultima/ultima8/gumps/game_map_gump.cpp b/engines/ultima/ultima8/gumps/game_map_gump.cpp
index 3ab58472e95..02dd824aed4 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.cpp
+++ b/engines/ultima/ultima8/gumps/game_map_gump.cpp
@@ -118,12 +118,12 @@ void GameMapGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled)
// Not fast, ignore
if (!map->isChunkFast(cx, cy)) continue;
- const Std::list<Item *> *items = map->getItemList(cx, cy);
+ const Common::List<Item *> *items = map->getItemList(cx, cy);
if (!items) continue;
- Std::list<Item *>::const_iterator it = items->begin();
- Std::list<Item *>::const_iterator end = items->end();
+ Common::List<Item *>::const_iterator it = items->begin();
+ Common::List<Item *>::const_iterator end = items->end();
for (; it != end; ++it) {
Item *item = *it;
if (!item) continue;
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index d23952c946b..d8cbab789ce 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -129,8 +129,8 @@ void Gump::Close(bool no_del) {
void Gump::RenderSurfaceChanged() {
// Iterate all children
- Std::list<Gump *>::iterator it = _children.reverse_begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.reverse_begin();
+ Common::List<Gump *>::iterator end = _children.end();
while (it != end) {
(*it)->RenderSurfaceChanged();
@@ -140,8 +140,8 @@ void Gump::RenderSurfaceChanged() {
void Gump::run() {
// Iterate all children
- Std::list<Gump *>::iterator it = _children.begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.begin();
+ Common::List<Gump *>::iterator end = _children.end();
while (it != end) {
Gump *g = *it;
@@ -169,8 +169,8 @@ void Gump::CloseItemDependents() {
}
// Pass the MapChanged message to all the children
- Std::list<Gump *>::iterator it = _children.begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.begin();
+ Common::List<Gump *>::iterator end = _children.end();
while (it != end) {
Gump *g = *it;
@@ -195,7 +195,7 @@ bool Gump::GetMouseCursor(int32 mx, int32 my, Shape &shape, int32 &frame) {
bool ret = false;
// This reverse iterates the children
- Std::list<Gump *>::iterator it;
+ Common::List<Gump *>::iterator it;
for (it = _children.reverse_begin(); it != _children.end(); --it)
{
Gump *g = *it;
@@ -285,8 +285,8 @@ void Gump::PaintCompositing(RenderSurface *surf, int32 lerp_factor,
surf->setClippingRect(new_rect);
// Iterate all children
- Std::list<Gump *>::iterator it = _children.reverse_begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.reverse_begin();
+ Common::List<Gump *>::iterator end = _children.end();
while (it != end) {
Gump *g = *it;
@@ -316,8 +316,8 @@ Gump *Gump::FindGump(int mx, int my) {
Gump *gump = nullptr;
// Iterate all children
- Std::list<Gump *>::iterator it = _children.reverse_begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.reverse_begin();
+ Common::List<Gump *>::iterator end = _children.end();
while (it != end && !gump) {
Gump *g = *it;
@@ -396,7 +396,7 @@ bool Gump::PointOnGump(int mx, int my) {
}
// reverse-iterate children
- Std::list<Gump *>::iterator it;
+ Common::List<Gump *>::iterator it;
for (it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
@@ -483,7 +483,7 @@ uint16 Gump::TraceObjId(int32 mx, int32 my) {
uint16 objId_ = 0;
// reverse-iterate children
- Std::list<Gump *>::iterator it;
+ Common::List<Gump *>::iterator it;
for (it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
@@ -559,7 +559,7 @@ void Gump::FindNewFocusChild() {
_focusChild = nullptr;
// Now add the gump to use as the new focus
- Std::list<Gump *>::iterator it = _children.reverse_begin();
+ Common::List<Gump *>::iterator it = _children.reverse_begin();
if (it != _children.end()) {
(*it)->MakeFocus();
@@ -576,8 +576,8 @@ void Gump::AddChild(Gump *gump, bool take_focus) {
if (old_parent) old_parent->RemoveChild(gump);
// Now add the gump in the correct spot
- Std::list<Gump *>::iterator it = _children.begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.begin();
+ Common::List<Gump *>::iterator end = _children.end();
for (; it != end; ++it) {
Gump *other = *it;
@@ -625,8 +625,8 @@ void Gump::MoveChildToFront(Gump *gump) {
_children.remove(gump);
- Std::list<Gump *>::iterator it = _children.begin();
- Std::list<Gump *>::iterator end = _children.end();
+ Common::List<Gump *>::iterator it = _children.begin();
+ Common::List<Gump *>::iterator end = _children.end();
for (; it != end; ++it) {
Gump *other = *it;
@@ -674,7 +674,7 @@ Gump *Gump::onMouseDown(int button, int32 mx, int32 my) {
Gump *handled = nullptr;
// Iterate children backwards
- Std::list<Gump *>::iterator it;
+ Common::List<Gump *>::iterator it;
for (it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
@@ -698,7 +698,7 @@ Gump *Gump::onMouseMotion(int32 mx, int32 my) {
Gump *handled = nullptr;
// Iterate children backwards
- Std::list<Gump *>::iterator it;
+ Common::List<Gump *>::iterator it;
for (it = _children.reverse_begin(); it != _children.end(); --it) {
Gump *g = *it;
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index be17a408249..9d1f2595647 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -62,7 +62,7 @@ protected:
//! The Gump list for this gump. This will contain all child gumps,
//! as well as all gump widgets.
- Std::list<Gump *> _children; // List of all gumps
+ Common::List<Gump *> _children; // List of all gumps
Gump *_focusChild; // The child that has focus
uint16 _notifier; // Process to notify when we're closing
diff --git a/engines/ultima/ultima8/kernel/kernel.h b/engines/ultima/ultima8/kernel/kernel.h
index 0a9eabd1dff..20d79b9fe71 100644
--- a/engines/ultima/ultima8/kernel/kernel.h
+++ b/engines/ultima/ultima8/kernel/kernel.h
@@ -34,8 +34,8 @@ class Process;
class idMan;
typedef Process *(*ProcessLoadFunc)(Common::ReadStream *rs, uint32 version);
-typedef Std::list<Process *>::const_iterator ProcessIter;
-typedef Std::list<Process *>::iterator ProcessIterator;
+typedef Common::List<Process *>::const_iterator ProcessIter;
+typedef Common::List<Process *>::iterator ProcessIterator;
class Kernel {
@@ -147,10 +147,10 @@ public:
private:
Process *loadProcess(Common::ReadStream *rs, uint32 version);
- Std::list<Process *> _processes;
+ Common::List<Process *> _processes;
idMan *_pIDs;
- Std::list<Process *>::iterator _currentProcess;
+ Common::List<Process *>::iterator _currentProcess;
Common::HashMap<Common::String, ProcessLoadFunc> _processLoaders;
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 183158bb605..08ded050312 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -307,8 +307,8 @@ void Mouse::setMouseCoords(int mx, int my) {
Gump *gump = desktopGump->onMouseMotion(mx, my);
if (gump && _mouseOverGump != gump->getObjId()) {
Gump *oldGump = getGump(_mouseOverGump);
- Std::list<Gump *> oldgumplist;
- Std::list<Gump *> newgumplist;
+ Common::List<Gump *> oldgumplist;
+ Common::List<Gump *> newgumplist;
// create lists of parents of old and new 'mouseover' gumps
if (oldGump) {
@@ -323,8 +323,8 @@ void Mouse::setMouseCoords(int mx, int my) {
newGump = newGump->GetParent();
}
- Std::list<Gump *>::iterator olditer = oldgumplist.begin();
- Std::list<Gump *>::iterator newiter = newgumplist.begin();
+ Common::List<Gump *>::iterator olditer = oldgumplist.begin();
+ Common::List<Gump *>::iterator newiter = newgumplist.begin();
// strip common prefix from lists
while (olditer != oldgumplist.end() &&
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index 98a25c71f5a..c43da6bb27e 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -729,7 +729,7 @@ void Debugger::dumpCurrentMap() {
// Work out the map limits in chunks
for (int32 y = 0; y < MAP_NUM_CHUNKS; y++) {
for (int32 x = 0; x < MAP_NUM_CHUNKS; x++) {
- const Std::list<Item *> *list = curmap->getItemList(x, y);
+ const Common::List<Item *> *list = curmap->getItemList(x, y);
// Should iterate the items!
// (items could extend outside of this chunk and they have height)
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index e9a5ad321f5..c82da12a7f4 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -81,7 +81,7 @@ protected:
UCStack _stack;
// "Free Me" list
- Std::list<Common::Pair<uint16, int> > _freeOnTerminate;
+ Common::List<Common::Pair<uint16, int> > _freeOnTerminate;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/animation_tracker.cpp b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
index e049d6bdeef..555d8015c42 100644
--- a/engines/ultima/ultima8/world/actors/animation_tracker.cpp
+++ b/engines/ultima/ultima8/world/actors/animation_tracker.cpp
@@ -273,7 +273,7 @@ bool AnimationTracker::step() {
int32 dims[3] = { xd, yd, zd };
// Do the sweep test
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
cm->sweepTest(start, end, dims, a->getShapeInfo()->_flags, _actor,
false, &collisions);
diff --git a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
index 952fc690e9e..623dbd3b54e 100644
--- a/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
+++ b/engines/ultima/ultima8/world/actors/cru_avatar_mover_process.cpp
@@ -511,7 +511,7 @@ void CruAvatarMoverProcess::step(Animation::Sequence action, Direction direction
// and not trigger any events
//
bool startvalid = true;
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
Point3 end(x, y, z);
avatar->setLocation(origpt);
currentmap->sweepTest(origpt, end, dims, avatar->getShapeInfo()->_flags,
diff --git a/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp b/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
index 02feb43d3b7..ef37464d91d 100644
--- a/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/rolling_thunder_process.cpp
@@ -268,7 +268,7 @@ bool RollingThunderProcess::fireDistance(Direction dir, int32 x, int32 y, int32
const Point3 end = oc;
const int32 dims[3] = {2, 2, 2};
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
cm->sweepTest(start, end, dims, ShapeInfo::SI_SOLID,
_itemNum, false, &collisions);
for (const auto &collision : collisions) {
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index 822c1307f2c..a75ce16f196 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -144,7 +144,7 @@ bool Container::addItem(Item *item, bool checkwghtvol) {
bool Container::removeItem(Item *item) {
- Std::list<Item *>::iterator iter;
+ Common::List<Item *>::iterator iter;
for (iter = _contents.begin(); iter != _contents.end(); ++iter) {
if (*iter == item) {
@@ -156,7 +156,7 @@ bool Container::removeItem(Item *item) {
}
bool Container::moveItemToEnd(Item *item) {
- Std::list<Item *>::iterator iter;
+ Common::List<Item *>::iterator iter;
for (iter = _contents.begin(); iter != _contents.end(); ++iter) {
if (*iter == item) {
diff --git a/engines/ultima/ultima8/world/container.h b/engines/ultima/ultima8/world/container.h
index 1511dc8e9fe..2018f9ccffd 100644
--- a/engines/ultima/ultima8/world/container.h
+++ b/engines/ultima/ultima8/world/container.h
@@ -123,7 +123,7 @@ public:
INTRINSIC(I_destroyContents);
protected:
- Std::list<Item *> _contents;
+ Common::List<Item *> _contents;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/current_map.cpp b/engines/ultima/ultima8/world/current_map.cpp
index a6d2b9a709a..0083b89ef86 100644
--- a/engines/ultima/ultima8/world/current_map.cpp
+++ b/engines/ultima/ultima8/world/current_map.cpp
@@ -46,7 +46,7 @@
namespace Ultima {
namespace Ultima8 {
-typedef Std::list<Item *> item_list;
+typedef Common::List<Item *> item_list;
const int INT_MAX_VALUE = 0x7fffffff;
const int INT_MIN_VALUE = -INT_MAX_VALUE - 1;
@@ -156,7 +156,7 @@ void CurrentMap::writeback() {
_eggHatcher = 0;
}
-void CurrentMap::loadItems(const Std::list<Item *> &itemlist, bool callCacheIn) {
+void CurrentMap::loadItems(const Common::List<Item *> &itemlist, bool callCacheIn) {
for (auto *item : itemlist) {
item->assignObjId();
@@ -673,7 +673,7 @@ TeleportEgg *CurrentMap::findDestination(uint16 id) {
return nullptr;
}
-const Std::list<Item *> *CurrentMap::getItemList(int32 gx, int32 gy) const {
+const Common::List<Item *> *CurrentMap::getItemList(int32 gx, int32 gy) const {
if (gx < 0 || gy < 0 || gx >= MAP_NUM_CHUNKS || gy >= MAP_NUM_CHUNKS)
return nullptr;
return &_items[gx][gy];
@@ -952,7 +952,7 @@ bool CurrentMap::scanForValidPosition(int32 x, int32 y, int32 z, const Item *ite
bool CurrentMap::sweepTest(const Point3 &start, const Point3 &end,
const int32 dims[3], uint32 shapeflags,
ObjId item, bool blocking_only,
- Std::list<SweepItem> *hit) const {
+ Common::List<SweepItem> *hit) const {
const uint32 blockflagmask = (ShapeInfo::SI_SOLID | ShapeInfo::SI_DAMAGING | ShapeInfo::SI_LAND);
int minx = ((start.x - dims[0]) / _mapChunkSize) - 1;
@@ -1000,7 +1000,7 @@ bool CurrentMap::sweepTest(const Point3 &start, const Point3 &end,
vel[0] - ext[0], vel[1] - ext[1], vel[2] - ext[2],
vel[0] + ext[0], vel[1] + ext[1], vel[2] + ext[2]);
- Std::list<SweepItem>::iterator sw_it;
+ Common::List<SweepItem>::iterator sw_it;
if (hit) sw_it = hit->end();
for (int cx = minx; cx <= maxx; cx++) {
diff --git a/engines/ultima/ultima8/world/current_map.h b/engines/ultima/ultima8/world/current_map.h
index 550c776fabd..c8b021ee6a8 100644
--- a/engines/ultima/ultima8/world/current_map.h
+++ b/engines/ultima/ultima8/world/current_map.h
@@ -167,12 +167,12 @@ public:
//! true if any items were hit.
bool sweepTest(const Point3 &start, const Point3 &end,
const int32 dims[3], uint32 shapeflags,
- ObjId item, bool solid_only, Std::list<SweepItem> *hit) const;
+ ObjId item, bool solid_only, Common::List<SweepItem> *hit) const;
TeleportEgg *findDestination(uint16 id);
// Not allowed to modify the list. Remember to use const_iterator
- const Std::list<Item *> *getItemList(int32 gx, int32 gy) const;
+ const Common::List<Item *> *getItemList(int32 gx, int32 gy) const;
bool isChunkFast(int32 cx, int32 cy) const {
// CONSTANTS!
@@ -193,7 +193,7 @@ public:
INTRINSIC(I_canExistAtPoint);
private:
- void loadItems(const Std::list<Item *> &itemlist, bool callCacheIn);
+ void loadItems(const Common::List<Item *> &itemlist, bool callCacheIn);
void createEggHatcher();
//! clip the given map chunk numbers to iterate over them safely
@@ -203,7 +203,7 @@ private:
// item lists. Lots of them :-)
// items[x][y]
- Std::list<Item *> _items[MAP_NUM_CHUNKS][MAP_NUM_CHUNKS];
+ Common::List<Item *> _items[MAP_NUM_CHUNKS][MAP_NUM_CHUNKS];
ProcId _eggHatcher;
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index d617f772de9..843cb79d15d 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -741,7 +741,7 @@ int Item::getRange(const Item &item2, bool checkz) const {
int Item::getRangeIfVisible(const Item &item2) const {
World *world = World::get_instance();
CurrentMap *map = world->getCurrentMap();
- Std::list<CurrentMap::SweepItem> hitItems;
+ Common::List<CurrentMap::SweepItem> hitItems;
Point3 start = getCentre();
Point3 end = item2.getCentre();
@@ -1060,7 +1060,7 @@ int32 Item::collideMove(int32 dx, int32 dy, int32 dz, bool teleport, bool force,
getFootpadWorld(dims[0], dims[1], dims[2]);
// Do the sweep test
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
map->sweepTest(start, end, dims, getShapeInfo()->_flags, _objId, false, &collisions);
// Ok, now to work out what to do
@@ -1135,7 +1135,7 @@ int32 Item::collideMove(int32 dx, int32 dy, int32 dz, bool teleport, bool force,
// if not, need to do 'stuff'
// We don't care about items hitting us at the start
if (!force) {
- Std::list<CurrentMap::SweepItem>::iterator it;
+ Common::List<CurrentMap::SweepItem>::iterator it;
for (it = collisions.begin(); it != collisions.end(); it++) {
if (it->_blocking && !it->_touching) {
if (hititem)
@@ -1454,7 +1454,7 @@ uint16 Item::fireDistance(const Item *other, Direction dir, int16 xoff, int16 yo
const Point3 end = oc;
const int32 dims[3] = {2, 2, 2};
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
cm->sweepTest(start, end, dims, ShapeInfo::SI_SOLID,
_objId, true, &collisions);
for (const auto &collision : collisions) {
@@ -2409,7 +2409,7 @@ int Item::getThrowRange() const {
}
static bool checkLineOfSightCollisions(
- const Std::list<CurrentMap::SweepItem> &collisions,
+ const Common::List<CurrentMap::SweepItem> &collisions,
bool usingAlternatePos, ObjId item, ObjId other) {
int32 other_hit_time = 0x4000;
int32 blocked_time = 0x4000;
@@ -2481,8 +2481,8 @@ bool Item::canReach(const Item *other, int range,
if (otherZ > pt1.z && otherZ < pt1.z + thisZd)
start.z = end.z; // bottom of other between bottom and top of this
- Std::list<CurrentMap::SweepItem> collisions;
- Std::list<CurrentMap::SweepItem>::iterator it;
+ Common::List<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem>::iterator it;
World *world = World::get_instance();
CurrentMap *map = world->getCurrentMap();
map->sweepTest(start, end, dims, ShapeInfo::SI_SOLID,
@@ -3626,7 +3626,7 @@ uint32 Item::I_legalMoveToPoint(const uint8 *args, unsigned int argsize) {
// If there are blockers, do partial move unless abort_if_blocked is set.
//
int retval = 1;
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
Point3 start = item->getLocation();
Point3 end(x, y, z);
int32 dims[3];
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index 43a12e66a26..0900931ecd5 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -191,7 +191,7 @@ void Map::unloadFixed() {
_fixedItems.clear();
}
-void Map::loadFixedFormatObjects(Std::list<Item *> &itemlist,
+void Map::loadFixedFormatObjects(Common::List<Item *> &itemlist,
Common::SeekableReadStream *rs,
uint32 extendedflags) {
if (!rs) return;
diff --git a/engines/ultima/ultima8/world/map.h b/engines/ultima/ultima8/world/map.h
index ef28ac1fdf1..b0601f88196 100644
--- a/engines/ultima/ultima8/world/map.h
+++ b/engines/ultima/ultima8/world/map.h
@@ -51,7 +51,7 @@ public:
private:
// load items from something formatted like 'fixed.dat'
- void loadFixedFormatObjects(Std::list<Item *> &itemlist,
+ void loadFixedFormatObjects(Common::List<Item *> &itemlist,
Common::SeekableReadStream *rs,
uint32 extendedflags);
@@ -71,8 +71,8 @@ private:
// since fixed items will be cached out most of the time)
- Std::list<Item *> _fixedItems;
- Std::list<Item *> _dynamicItems;
+ Common::List<Item *> _fixedItems;
+ Common::List<Item *> _dynamicItems;
uint32 _mapNum;
};
diff --git a/engines/ultima/ultima8/world/minimap.cpp b/engines/ultima/ultima8/world/minimap.cpp
index 99d3e047634..ae99b2ed984 100644
--- a/engines/ultima/ultima8/world/minimap.cpp
+++ b/engines/ultima/ultima8/world/minimap.cpp
@@ -91,7 +91,7 @@ uint32 MiniMap::sampleAtPoint(const CurrentMap &map, int x, int y) {
Point3 end(x, y, -1);
int32 dims[3] = {0, 0, 0};
uint32 shflags = ShapeInfo::SI_ROOF | ShapeInfo::SI_OCCL | ShapeInfo::SI_LAND | ShapeInfo::SI_SEA;
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
if (map.sweepTest(start, end, dims, shflags, 0, false, &collisions)) {
for (const auto &collision : collisions) {
const Item *item = getItem(collision._item);
diff --git a/engines/ultima/ultima8/world/missile_tracker.cpp b/engines/ultima/ultima8/world/missile_tracker.cpp
index 0ebd76df919..651ae8a6557 100644
--- a/engines/ultima/ultima8/world/missile_tracker.cpp
+++ b/engines/ultima/ultima8/world/missile_tracker.cpp
@@ -146,7 +146,7 @@ bool MissileTracker::isPathClear() const {
end.z = start.z + sz;
// Do the sweep test
- Std::list<CurrentMap::SweepItem> collisions;
+ Common::List<CurrentMap::SweepItem> collisions;
map->sweepTest(start, end, dims, item->getShapeInfo()->_flags, _objId,
false, &collisions);
diff --git a/engines/ultima/ultima8/world/snap_process.cpp b/engines/ultima/ultima8/world/snap_process.cpp
index 37dcc9b0cc6..69c766bf43b 100644
--- a/engines/ultima/ultima8/world/snap_process.cpp
+++ b/engines/ultima/ultima8/world/snap_process.cpp
@@ -113,7 +113,7 @@ void SnapProcess::updateCurrentEgg() {
void SnapProcess::removeEgg(Item *item) {
assert(item);
ObjId id = item->getObjId();
- for (Std::list<ObjId>::iterator iter = _snapEggs.begin();
+ for (Common::List<ObjId>::iterator iter = _snapEggs.begin();
iter != _snapEggs.end(); iter++) {
if (*iter == id) {
iter = _snapEggs.erase(iter);
diff --git a/engines/ultima/ultima8/world/snap_process.h b/engines/ultima/ultima8/world/snap_process.h
index 70682ff6e6f..e82116e368a 100644
--- a/engines/ultima/ultima8/world/snap_process.h
+++ b/engines/ultima/ultima8/world/snap_process.h
@@ -57,7 +57,7 @@ protected:
ObjId _currentSnapEgg;
Common::Rect32 _currentSnapEggRange;
- Std::list<ObjId> _snapEggs;
+ Common::List<ObjId> _snapEggs;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/sort_item.h b/engines/ultima/ultima8/world/sort_item.h
index d25dbda15f2..2659a3fa6dd 100644
--- a/engines/ultima/ultima8/world/sort_item.h
+++ b/engines/ultima/ultima8/world/sort_item.h
@@ -122,7 +122,7 @@ struct SortItem {
// Note that PriorityQueue could be used here, BUT there is no guarantee that it's implementation
// will be friendly to insertions
- // Alternatively i could use Std::list, BUT there is no guarantee that it will keep won't delete
+ // Alternatively i could use Common::List, BUT there is no guarantee that it will keep won't delete
// the unused nodes after doing a clear
// So the only reasonable solution is to write my own list
struct DependsList {
diff --git a/engines/ultima/ultima8/world/super_sprite_process.cpp b/engines/ultima/ultima8/world/super_sprite_process.cpp
index 0a29de344ae..64631d13731 100644
--- a/engines/ultima/ultima8/world/super_sprite_process.cpp
+++ b/engines/ultima/ultima8/world/super_sprite_process.cpp
@@ -324,7 +324,7 @@ void SuperSpriteProcess::hitAndFinish() {
int32 dims[3] = {1, 1, 1};
// will never get a collision if not stepping at all..
bool collision = !(xstep || ystep || zstep);
- Std::list<CurrentMap::SweepItem> hits;
+ Common::List<CurrentMap::SweepItem> hits;
while (!collision) {
CurrentMap *map = World::get_instance()->getCurrentMap();
@@ -448,7 +448,7 @@ bool SuperSpriteProcess::areaSearch() {
start = item->getLocation();
}
- Std::list<CurrentMap::SweepItem> hits;
+ Common::List<CurrentMap::SweepItem> hits;
map->sweepTest(start, end, dims, ShapeInfo::SI_SOLID,
_source, true, &hits);
diff --git a/engines/ultima/ultima8/world/world.cpp b/engines/ultima/ultima8/world/world.cpp
index f2f23f7c4f7..21510e086bd 100644
--- a/engines/ultima/ultima8/world/world.cpp
+++ b/engines/ultima/ultima8/world/world.cpp
@@ -372,7 +372,7 @@ void World::save(Common::WriteStream *ws) {
// empty stack and refill it again
uint16 *e = new uint16[es];
- Std::list<ObjId>::const_iterator it = _ethereal.begin();
+ Common::List<ObjId>::const_iterator it = _ethereal.begin();
unsigned int i;
for (i = 0; i < es; ++i) {
e[es - i] = *it;
diff --git a/engines/ultima/ultima8/world/world.h b/engines/ultima/ultima8/world/world.h
index 17e0d678d35..9034f61dc40 100644
--- a/engines/ultima/ultima8/world/world.h
+++ b/engines/ultima/ultima8/world/world.h
@@ -180,7 +180,7 @@ private:
Std::vector<Map *> _maps;
CurrentMap *_currentMap;
- Std::list<ObjId> _ethereal;
+ Common::List<ObjId> _ethereal;
bool _alertActive; //!< is intruder alert active (Crusader)
uint8 _difficulty; //!< game difficulty level (Crusader)
Commit: 8700d7ead74766648a39f0536d2e9e606421dda7
https://github.com/scummvm/scummvm/commit/8700d7ead74766648a39f0536d2e9e606421dda7
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-02-07T16:48:36+02:00
Commit Message:
ULTIMA: Replace Std::vector with Common::Array
Changed paths:
engines/ultima/nuvie/actors/actor.cpp
engines/ultima/nuvie/actors/actor.h
engines/ultima/nuvie/actors/actor_manager.cpp
engines/ultima/nuvie/actors/actor_manager.h
engines/ultima/nuvie/conf/configuration.h
engines/ultima/nuvie/core/anim_manager.cpp
engines/ultima/nuvie/core/anim_manager.h
engines/ultima/nuvie/core/converse_interpret.h
engines/ultima/nuvie/core/cursor.cpp
engines/ultima/nuvie/core/cursor.h
engines/ultima/nuvie/core/effect.cpp
engines/ultima/nuvie/core/effect.h
engines/ultima/nuvie/core/effect_manager.h
engines/ultima/nuvie/core/events.h
engines/ultima/nuvie/core/game_clock.h
engines/ultima/nuvie/files/u6_lib_n.h
engines/ultima/nuvie/fonts/font_manager.h
engines/ultima/nuvie/gui/widgets/map_window.h
engines/ultima/nuvie/misc/actor_list.h
engines/ultima/nuvie/misc/u6_misc.cpp
engines/ultima/nuvie/pathfinder/astar_path.cpp
engines/ultima/nuvie/pathfinder/party_path_finder.cpp
engines/ultima/nuvie/pathfinder/party_path_finder.h
engines/ultima/nuvie/pathfinder/seek_path.cpp
engines/ultima/nuvie/pathfinder/seek_path.h
engines/ultima/nuvie/script/script.cpp
engines/ultima/nuvie/script/script_cutscene.cpp
engines/ultima/nuvie/script/script_cutscene.h
engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
engines/ultima/nuvie/sound/sound.h
engines/ultima/nuvie/sound/sound_manager.cpp
engines/ultima/nuvie/sound/towns_sfx_manager.cpp
engines/ultima/shared/std/containers.h
engines/ultima/ultima4/controllers/combat_controller.cpp
engines/ultima/ultima4/controllers/game_controller.cpp
engines/ultima/ultima4/controllers/intro_controller.cpp
engines/ultima/ultima4/controllers/intro_controller.h
engines/ultima/ultima4/conversation/conversation.cpp
engines/ultima/ultima4/conversation/conversation.h
engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
engines/ultima/ultima4/conversation/dialogueloader_lb.cpp
engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
engines/ultima/ultima4/core/config.cpp
engines/ultima/ultima4/core/config.h
engines/ultima/ultima4/core/debugger.cpp
engines/ultima/ultima4/core/observable.h
engines/ultima/ultima4/core/settings.cpp
engines/ultima/ultima4/core/settings.h
engines/ultima/ultima4/core/utils.cpp
engines/ultima/ultima4/core/utils.h
engines/ultima/ultima4/events/event_handler.h
engines/ultima/ultima4/filesys/u4file.cpp
engines/ultima/ultima4/filesys/u4file.h
engines/ultima/ultima4/game/armor.cpp
engines/ultima/ultima4/game/armor.h
engines/ultima/ultima4/game/context.h
engines/ultima/ultima4/game/creature.cpp
engines/ultima/ultima4/game/creature.h
engines/ultima/ultima4/game/game.cpp
engines/ultima/ultima4/game/game.h
engines/ultima/ultima4/game/person.cpp
engines/ultima/ultima4/game/player.cpp
engines/ultima/ultima4/game/player.h
engines/ultima/ultima4/game/script.cpp
engines/ultima/ultima4/game/script.h
engines/ultima/ultima4/game/spell.cpp
engines/ultima/ultima4/game/weapon.cpp
engines/ultima/ultima4/gfx/imageloader_u4.cpp
engines/ultima/ultima4/gfx/imagemgr.cpp
engines/ultima/ultima4/gfx/imagemgr.h
engines/ultima/ultima4/gfx/screen.cpp
engines/ultima/ultima4/gfx/screen.h
engines/ultima/ultima4/map/city.h
engines/ultima/ultima4/map/dungeon.h
engines/ultima/ultima4/map/location.cpp
engines/ultima/ultima4/map/location.h
engines/ultima/ultima4/map/map.h
engines/ultima/ultima4/map/mapmgr.cpp
engines/ultima/ultima4/map/mapmgr.h
engines/ultima/ultima4/map/shrine.h
engines/ultima/ultima4/map/tile.h
engines/ultima/ultima4/map/tileanim.cpp
engines/ultima/ultima4/map/tileanim.h
engines/ultima/ultima4/map/tilemap.cpp
engines/ultima/ultima4/map/tileset.cpp
engines/ultima/ultima4/sound/music.cpp
engines/ultima/ultima4/sound/music.h
engines/ultima/ultima4/sound/sound.cpp
engines/ultima/ultima4/sound/sound.h
engines/ultima/ultima4/ultima4.h
engines/ultima/ultima4/views/dungeonview.cpp
engines/ultima/ultima4/views/dungeonview.h
engines/ultima/ultima4/views/menuitem.cpp
engines/ultima/ultima4/views/menuitem.h
engines/ultima/ultima4/views/tileview.cpp
engines/ultima/ultima4/views/tileview.h
engines/ultima/ultima8/audio/sound_flex.h
engines/ultima/ultima8/audio/speech_flex.h
engines/ultima/ultima8/conf/config_file_manager.cpp
engines/ultima/ultima8/conf/config_file_manager.h
engines/ultima/ultima8/filesys/archive.h
engines/ultima/ultima8/filesys/raw_archive.h
engines/ultima/ultima8/games/game_data.cpp
engines/ultima/ultima8/games/game_data.h
engines/ultima/ultima8/games/game_info.cpp
engines/ultima/ultima8/games/treasure_loader.cpp
engines/ultima/ultima8/games/treasure_loader.h
engines/ultima/ultima8/gfx/anim_dat.h
engines/ultima/ultima8/gfx/fonts/font_manager.h
engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
engines/ultima/ultima8/gfx/gump_shape_archive.h
engines/ultima/ultima8/gfx/palette_manager.h
engines/ultima/ultima8/gfx/shape_archive.h
engines/ultima/ultima8/gfx/skf_player.h
engines/ultima/ultima8/gfx/type_flags.cpp
engines/ultima/ultima8/gfx/type_flags.h
engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
engines/ultima/ultima8/gumps/keypad_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.cpp
engines/ultima/ultima8/gumps/message_box_gump.h
engines/ultima/ultima8/gumps/u8_save_gump.h
engines/ultima/ultima8/gumps/weasel_dat.h
engines/ultima/ultima8/gumps/weasel_gump.cpp
engines/ultima/ultima8/gumps/weasel_gump.h
engines/ultima/ultima8/kernel/object_manager.h
engines/ultima/ultima8/kernel/process.cpp
engines/ultima/ultima8/kernel/process.h
engines/ultima/ultima8/misc/id_man.h
engines/ultima/ultima8/misc/util.cpp
engines/ultima/ultima8/misc/util.h
engines/ultima/ultima8/usecode/uc_list.h
engines/ultima/ultima8/world/actors/actor.cpp
engines/ultima/ultima8/world/actors/actor_anim.h
engines/ultima/ultima8/world/actors/anim_action.h
engines/ultima/ultima8/world/actors/main_actor.cpp
engines/ultima/ultima8/world/actors/monster_info.h
engines/ultima/ultima8/world/actors/npc_dat.cpp
engines/ultima/ultima8/world/actors/npc_dat.h
engines/ultima/ultima8/world/actors/pathfinder.cpp
engines/ultima/ultima8/world/actors/pathfinder.h
engines/ultima/ultima8/world/actors/pathfinder_process.h
engines/ultima/ultima8/world/actors/treasure_info.h
engines/ultima/ultima8/world/actors/weapon_overlay.h
engines/ultima/ultima8/world/container.cpp
engines/ultima/ultima8/world/container.h
engines/ultima/ultima8/world/egg_hatcher_process.h
engines/ultima/ultima8/world/item_selection_process.cpp
engines/ultima/ultima8/world/map_glob.h
engines/ultima/ultima8/world/world.h
diff --git a/engines/ultima/nuvie/actors/actor.cpp b/engines/ultima/nuvie/actors/actor.cpp
index 1bf5228039a..ac7f0d33daa 100644
--- a/engines/ultima/nuvie/actors/actor.cpp
+++ b/engines/ultima/nuvie/actors/actor.cpp
@@ -1654,7 +1654,7 @@ void Actor::subtract_light(uint8 val) {
// light -= val;
// else
// light = 0;
- for (vector<uint8>::iterator l = light_source.begin(); l != light_source.end(); l++) {
+ for (Common::Array<uint8>::iterator l = light_source.begin(); l != light_source.end(); l++) {
if (*l == val) {
light_source.erase(l);
break;
diff --git a/engines/ultima/nuvie/actors/actor.h b/engines/ultima/nuvie/actors/actor.h
index 53b5bc44861..2ad63492e5b 100644
--- a/engines/ultima/nuvie/actors/actor.h
+++ b/engines/ultima/nuvie/actors/actor.h
@@ -31,8 +31,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
#define ACTOR_NO_READIABLE_LOCATION -1
#define ACTOR_HEAD 0
#define ACTOR_NECK 1
@@ -266,7 +264,7 @@ protected:
sint8 moves; // number of moves actor has this turn
uint8 light; // level of light around actor (normally 0)
- vector<uint8> light_source;
+ Common::Array<uint8> light_source;
ActorError error_struct; // error/status; result of previous action
diff --git a/engines/ultima/nuvie/actors/actor_manager.cpp b/engines/ultima/nuvie/actors/actor_manager.cpp
index 0eb97e66f77..43f2f9995dc 100644
--- a/engines/ultima/nuvie/actors/actor_manager.cpp
+++ b/engines/ultima/nuvie/actors/actor_manager.cpp
@@ -1106,7 +1106,7 @@ void ActorManager::loadAvatarTiles(const Common::Path &datadir) {
uint8 avatar_portrait = Game::get_game()->get_portrait()->get_avatar_portrait_num();
- Std::vector<Common::String> files = getCustomTileFilenames(datadir, "avatar_###_####.bmp");
+ Common::Array<Common::String> files = getCustomTileFilenames(datadir, "avatar_###_####.bmp");
for (const Common::String &filename : files) {
if (filename.size() != 19) { // avatar_nnn_nnnn.bmp
@@ -1134,7 +1134,7 @@ void ActorManager::loadAvatarTiles(const Common::Path &datadir) {
void ActorManager::loadNPCTiles(const Common::Path &datadir) {
Common::Path imagefile;
- Std::vector<Common::String> files = getCustomTileFilenames(datadir, "actor_###_####.bmp");
+ Common::Array<Common::String> files = getCustomTileFilenames(datadir, "actor_###_####.bmp");
for (const Common::String &filename : files) {
if (filename.size() != 18) { // actor_nnn_nnnn.bmp
@@ -1157,7 +1157,7 @@ void ActorManager::loadNPCTiles(const Common::Path &datadir) {
return;
}
-Std::vector<Common::String> ActorManager::getCustomTileFilenames(const Common::Path &datadir, const Common::String &filenamePrefix) {
+Common::Array<Common::String> ActorManager::getCustomTileFilenames(const Common::Path &datadir, const Common::String &filenamePrefix) {
NuvieFileList filelistDataDir;
NuvieFileList filelistSaveGameDir;
Common::Path path;
@@ -1173,7 +1173,7 @@ Std::vector<Common::String> ActorManager::getCustomTileFilenames(const Common::P
const Common::List<NuvieFileDesc> &dataFiles = filelistDataDir.get_filelist();
Common::EqualTo<Common::String> comparitor;
- Std::vector<Common::String> filenames;
+ Common::Array<Common::String> filenames;
for (const auto &desc : files) {
filenames.push_back(desc.filename);
}
diff --git a/engines/ultima/nuvie/actors/actor_manager.h b/engines/ultima/nuvie/actors/actor_manager.h
index aa11e9b1518..ca641ce25b2 100644
--- a/engines/ultima/nuvie/actors/actor_manager.h
+++ b/engines/ultima/nuvie/actors/actor_manager.h
@@ -164,7 +164,7 @@ private:
void loadNPCTiles(const Common::Path &datadir);
void loadAvatarTiles(const Common::Path &datadir);
void loadCustomBaseTiles();
- Std::vector<Common::String> getCustomTileFilenames(const Common::Path &datadir, const Common::String &filenamePrefix);
+ Common::Array<Common::String> getCustomTileFilenames(const Common::Path &datadir, const Common::String &filenamePrefix);
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/conf/configuration.h b/engines/ultima/nuvie/conf/configuration.h
index ad31f73ff56..d13099fcb1e 100644
--- a/engines/ultima/nuvie/conf/configuration.h
+++ b/engines/ultima/nuvie/conf/configuration.h
@@ -60,7 +60,7 @@ class ConfigNode;
*/
class Configuration {
private:
- Std::vector<Shared::XMLTree*> _trees;
+ Common::Array<Shared::XMLTree*> _trees;
Common::HashMap<Common::String, Common::String, Common::IgnoreCase_Hash,
Common::IgnoreCase_EqualTo> _localKeys;
Common::HashMap<Common::String, Common::String, Common::IgnoreCase_Hash,
diff --git a/engines/ultima/nuvie/core/anim_manager.cpp b/engines/ultima/nuvie/core/anim_manager.cpp
index 139822d85b5..ec96ad3c110 100644
--- a/engines/ultima/nuvie/core/anim_manager.cpp
+++ b/engines/ultima/nuvie/core/anim_manager.cpp
@@ -339,8 +339,8 @@ PositionedTile *TileAnim::add_tile(Tile *tile, sint16 x, sint16 y,
*/
void TileAnim::remove_tile(uint32 i) {
if (i < _tiles.size()) {
- //vector<PositionedTile*>::iterator ti = &tiles[i];
- Std::vector<PositionedTile *>::iterator ti = _tiles.begin();
+ //Common::Array<PositionedTile*>::iterator ti = &tiles[i];
+ Common::Array<PositionedTile *>::iterator ti = _tiles.begin();
for (uint32 j = 0; j < i; j++)
ti++;
@@ -350,7 +350,7 @@ void TileAnim::remove_tile(uint32 i) {
}
void TileAnim::remove_tile(PositionedTile *p_tile) {
- Std::vector<PositionedTile *>::iterator ti = _tiles.begin();
+ Common::Array<PositionedTile *>::iterator ti = _tiles.begin();
for (; ti != _tiles.end(); ti++) {
if (*ti == p_tile) {
delete *ti;
@@ -953,7 +953,7 @@ void ExplosiveAnim::get_shifted_location(uint16 &x, uint16 &y, uint16 &px_, uint
/*** ProjectileAnim ***/
-ProjectileAnim::ProjectileAnim(uint16 tileNum, MapCoord *start, vector<MapCoord> target, uint8 animSpeed, bool leaveTrail, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
+ProjectileAnim::ProjectileAnim(uint16 tileNum, MapCoord *start, Common::Array<MapCoord> target, uint8 animSpeed, bool leaveTrail, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
tile_num = tileNum; //382; // U6 FIREBALL_EFFECT
src_tile_y_offset = src_y_offset;
src = *start;
diff --git a/engines/ultima/nuvie/core/anim_manager.h b/engines/ultima/nuvie/core/anim_manager.h
index e1eea9fa508..45b7f122609 100644
--- a/engines/ultima/nuvie/core/anim_manager.h
+++ b/engines/ultima/nuvie/core/anim_manager.h
@@ -32,8 +32,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
class Actor;
class CallBack;
class AnimManager;
@@ -203,7 +201,7 @@ protected:
uint32 _tx, _ty, // location on surface: in increments of "tile_pitch"
_px, _py; // location on surface: pixel offset from tx,ty
- vector<PositionedTile *> _tiles;
+ Common::Array<PositionedTile *> _tiles;
void display() override;
@@ -337,9 +335,9 @@ typedef struct {
class ExplosiveAnim : public TimedAnim {
MapCoord center;
uint32 radius; // num. of spaces from center
- vector<ExplosiveAnimSegment> flame; // lines of fire from the center
+ Common::Array<ExplosiveAnimSegment> flame; // lines of fire from the center
uint16 exploding_tile_num; // fireball effect tile_num
- vector<MapEntity> hit_items; // things the explosion has hit
+ Common::Array<MapEntity> hit_items; // things the explosion has hit
public:
ExplosiveAnim(const MapCoord &start, uint32 size);
@@ -367,16 +365,16 @@ typedef struct {
class ProjectileAnim : public TileAnim {
MapCoord src;
- vector<ProjectileLine> line;
+ Common::Array<ProjectileLine> line;
uint16 tile_num; // fireball effect tile_num
uint8 src_tile_y_offset; //amount to offset src_tile when rotating. Used by arrows and bolts
- vector<MapEntity> hit_items; // things the projectile has hit
+ Common::Array<MapEntity> hit_items; // things the projectile has hit
uint16 stopped_count;
uint8 speed; //number of pixels to move in a single update.
bool leaveTrailFlag;
public:
- ProjectileAnim(uint16 tileNum, MapCoord *start, vector<MapCoord> target, uint8 animSpeed, bool leaveTrailFlag = false, uint16 initialTileRotation = 0, uint16 rotationAmount = 0, uint8 src_y_offset = 0);
+ ProjectileAnim(uint16 tileNum, MapCoord *start, Common::Array<MapCoord> target, uint8 animSpeed, bool leaveTrailFlag = false, uint16 initialTileRotation = 0, uint16 rotationAmount = 0, uint8 src_y_offset = 0);
~ProjectileAnim() override;
void start() override;
diff --git a/engines/ultima/nuvie/core/converse_interpret.h b/engines/ultima/nuvie/core/converse_interpret.h
index 82d74149540..82861d5b94d 100644
--- a/engines/ultima/nuvie/core/converse_interpret.h
+++ b/engines/ultima/nuvie/core/converse_interpret.h
@@ -27,8 +27,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
/* Control and value opcodes for op() & evop() (U6) */
#define U6OP_GT 0x81
#define U6OP_GE 0x82
@@ -143,10 +141,10 @@ protected:
converse_value break_c; // will toggle run setting
};
- vector<struct in_val_s> in; // control values (input/instruction)
+ Common::Array<struct in_val_s> in; // control values (input/instruction)
uint32 in_start;
Common::String text; // input text from script
- vector<Common::String> rstrings; // string value(s) returned by op
+ Common::Array<Common::String> rstrings; // string value(s) returned by op
Common::String ystring; // modified by SETNAME, accessed with "$Y"
uint8 decl_v; // declared/initialized variable number
uint8 decl_t; // declared variable type: 0x00=none,0xb2=int,0xb3=string
diff --git a/engines/ultima/nuvie/core/cursor.cpp b/engines/ultima/nuvie/core/cursor.cpp
index 48f7e15bdc3..195cca7ae54 100644
--- a/engines/ultima/nuvie/core/cursor.cpp
+++ b/engines/ultima/nuvie/core/cursor.cpp
@@ -33,8 +33,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
Cursor::Cursor() : cursor_id(0), cur_x(-1), cur_y(-1), cleanup(nullptr),
hidden(false), screen(nullptr), config(nullptr), screen_w(0), screen_h(0) {
diff --git a/engines/ultima/nuvie/core/cursor.h b/engines/ultima/nuvie/core/cursor.h
index 10951cd8612..171622e7c08 100644
--- a/engines/ultima/nuvie/core/cursor.h
+++ b/engines/ultima/nuvie/core/cursor.h
@@ -48,7 +48,7 @@ class Cursor {
Screen *screen;
const Configuration *config;
sint32 cur_x, cur_y; // location on screen, unused normally
- Std::vector<MousePointer *> cursors; // pointer list
+ Common::Array<MousePointer *> cursors; // pointer list
uint8 cursor_id; // which pointer is active
unsigned char *cleanup; // restore image behind cursor
diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index c927383b63e..b8778320f8a 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -233,17 +233,17 @@ void ExpEffect::start_anim() {
}
ProjectileEffect::ProjectileEffect(uint16 tileNum, MapCoord start, MapCoord target, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
- vector<MapCoord> t;
+ Common::Array<MapCoord> t;
t.push_back(target);
init(tileNum, start, t, speed, trailFlag, initialTileRotation, rotationAmount, src_y_offset);
}
-ProjectileEffect::ProjectileEffect(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation) {
+ProjectileEffect::ProjectileEffect(uint16 tileNum, MapCoord start, const Common::Array<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation) {
init(tileNum, start, t, speed, trailFlag, initialTileRotation, 0, 0);
}
-void ProjectileEffect::init(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
+void ProjectileEffect::init(uint16 tileNum, MapCoord start, const Common::Array<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset) {
finished_tiles = 0;
tile_num = tileNum;
diff --git a/engines/ultima/nuvie/core/effect.h b/engines/ultima/nuvie/core/effect.h
index 944ed35c042..0ba5b53f2c4 100644
--- a/engines/ultima/nuvie/core/effect.h
+++ b/engines/ultima/nuvie/core/effect.h
@@ -123,7 +123,7 @@ protected:
uint16 tile_num;
MapCoord start_loc; // where explosion will start
- vector<MapCoord> targets;
+ Common::Array<MapCoord> targets;
uint8 anim_speed;
bool trail;
uint16 initial_tile_rotation;
@@ -131,7 +131,7 @@ protected:
uint8 src_tile_y_offset;
uint16 finished_tiles;
- vector<MapEntity> hit_entities;
+ Common::Array<MapEntity> hit_entities;
virtual void start_anim();
@@ -141,13 +141,13 @@ public:
finished_tiles(0) {
}
ProjectileEffect(uint16 tileNum, MapCoord start, MapCoord target, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
- ProjectileEffect(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation);
+ ProjectileEffect(uint16 tileNum, MapCoord start, const Common::Array<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation);
- void init(uint16 tileNum, MapCoord start, const vector<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
+ void init(uint16 tileNum, MapCoord start, const Common::Array<MapCoord> &t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
uint16 callback(uint16 msg, CallBack *caller, void *data) override;
- vector<MapEntity> *get_hit_entities() {
+ Common::Array<MapEntity> *get_hit_entities() {
return &hit_entities;
}
};
diff --git a/engines/ultima/nuvie/core/effect_manager.h b/engines/ultima/nuvie/core/effect_manager.h
index ca0dd27b0dc..b0a8c5fb69d 100644
--- a/engines/ultima/nuvie/core/effect_manager.h
+++ b/engines/ultima/nuvie/core/effect_manager.h
@@ -33,18 +33,18 @@ class Effect;
*/
class EffectManager {
friend class Effect;
- typedef Std::vector<Effect *>::iterator EffectIterator;
- typedef Std::vector<Effect *>::const_iterator ConstEffectIterator;
+ typedef Common::Array<Effect *>::iterator EffectIterator;
+ typedef Common::Array<Effect *>::const_iterator ConstEffectIterator;
/* For each EffectWatch, a message will be sent to "watcher" when
"effect" is deleted. */
typedef struct {
CallBack *watcher;
Effect *effect;
} EffectWatch;
- typedef Std::vector<EffectWatch>::iterator WatchIterator;
+ typedef Common::Array<EffectWatch>::iterator WatchIterator;
- Std::vector<Effect *> effects; // the simple list
- Std::vector<EffectWatch> watched;
+ Common::Array<Effect *> effects; // the simple list
+ Common::Array<EffectWatch> watched;
void add_effect(Effect *eff); // only effects can add themselves
void signal_watch(Effect *effect);
diff --git a/engines/ultima/nuvie/core/events.h b/engines/ultima/nuvie/core/events.h
index 36385ba5696..b837c3a955e 100644
--- a/engines/ultima/nuvie/core/events.h
+++ b/engines/ultima/nuvie/core/events.h
@@ -203,7 +203,7 @@ private:
Common::Event event;
EventMode mode, last_mode;
EventInput input; // collected/received input (of any type)
-// Std::vector<EventMode> mode_stack; // current mode is at the end of the list
+// Common::Array<EventMode> mode_stack; // current mode is at the end of the list
int ts; //timestamp for TimeLeft() method.
int altCodeVal;
uint16 active_alt_code; // alt-code that needs more input
diff --git a/engines/ultima/nuvie/core/game_clock.h b/engines/ultima/nuvie/core/game_clock.h
index 087d04c110e..7b4a00a091e 100644
--- a/engines/ultima/nuvie/core/game_clock.h
+++ b/engines/ultima/nuvie/core/game_clock.h
@@ -29,8 +29,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
#define GAMECLOCK_TICKS_PER_MINUTE 4
#define GAMECLOCK_NUM_TIMERS 16
@@ -65,7 +63,7 @@ class GameClock {
//bool active; // clock is active and running (false = paused)
- vector<uint8> timers;
+ Common::Array<uint8> timers;
uint8 num_timers;
uint8 rest_counter; //hours until the party will heal again while resting.
diff --git a/engines/ultima/nuvie/files/u6_lib_n.h b/engines/ultima/nuvie/files/u6_lib_n.h
index 0c793981676..c876c1098b8 100644
--- a/engines/ultima/nuvie/files/u6_lib_n.h
+++ b/engines/ultima/nuvie/files/u6_lib_n.h
@@ -29,8 +29,6 @@
namespace Ultima {
namespace Nuvie {
-//using Std::vector;
-
class NuvieIO;
struct U6LibItem {
diff --git a/engines/ultima/nuvie/fonts/font_manager.h b/engines/ultima/nuvie/fonts/font_manager.h
index 9cad18ad3a4..813d743964d 100644
--- a/engines/ultima/nuvie/fonts/font_manager.h
+++ b/engines/ultima/nuvie/fonts/font_manager.h
@@ -36,7 +36,7 @@ class Font;
class FontManager {
const Configuration *config;
- Std::vector<Font *> fonts;
+ Common::Array<Font *> fonts;
uint16 num_fonts;
Font *conv_font;
Font *conv_garg_font;
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.h b/engines/ultima/nuvie/gui/widgets/map_window.h
index b88a529772f..fa3d29511b4 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.h
+++ b/engines/ultima/nuvie/gui/widgets/map_window.h
@@ -142,8 +142,8 @@ class MapWindow: public GUI_Widget {
bool draw_brit_lens_anim;
bool draw_garg_lens_anim;
-// Std::vector<TileInfo> m_ViewableObjTiles; // shouldn't need this for in_town checks
- Std::vector<TileInfo> m_ViewableMapTiles;
+// Common::Array<TileInfo> m_ViewableObjTiles; // shouldn't need this for in_town checks
+ Common::Array<TileInfo> m_ViewableMapTiles;
bool lighting_update_required;
@@ -326,7 +326,7 @@ public:
return roof_tiles;
}
- Std::vector<const Obj *> m_ViewableObjects; //^^ dodgy public buffer
+ Common::Array<const Obj *> m_ViewableObjects; //^^ dodgy public buffer
void wizard_eye_start(const MapCoord &location, uint16 duration, CallBack *caller);
diff --git a/engines/ultima/nuvie/misc/actor_list.h b/engines/ultima/nuvie/misc/actor_list.h
index 9d5fe5eb91a..b1348c9888e 100644
--- a/engines/ultima/nuvie/misc/actor_list.h
+++ b/engines/ultima/nuvie/misc/actor_list.h
@@ -30,8 +30,8 @@ namespace Nuvie {
class Actor;
-typedef Std::vector<Actor *> ActorList;
-typedef Std::vector<Actor *>::iterator ActorIterator;
+typedef Common::Array<Actor *> ActorList;
+typedef Common::Array<Actor *>::iterator ActorIterator;
} // End of namespace Nuvie
} // End of namespace Ultima
diff --git a/engines/ultima/nuvie/misc/u6_misc.cpp b/engines/ultima/nuvie/misc/u6_misc.cpp
index 9f06ce759ce..ca9a0196e87 100644
--- a/engines/ultima/nuvie/misc/u6_misc.cpp
+++ b/engines/ultima/nuvie/misc/u6_misc.cpp
@@ -31,9 +31,7 @@
namespace Ultima {
namespace Nuvie {
-using namespace Std;
-
-void Tokenise(const Common::String &str, Std::vector<Common::String> &tokens, char delimiter = ' ') {
+void Tokenise(const Common::String &str, Common::Array<Common::String> &tokens, char delimiter = ' ') {
Common::String delimiters(delimiter);
// Skip delimiters at beginning.
@@ -92,7 +90,7 @@ void config_get_path(const Configuration *config, const Common::String &filename
int mkdir_recursive(const Common::Path &path, int mode) {
#ifdef TODO
- vector<Common::String> directories;
+ Common::Array<Common::String> directories;
Common::String tmp_path;
Tokenise(path, directories, U6PATH_DELIMITER);
diff --git a/engines/ultima/nuvie/pathfinder/astar_path.cpp b/engines/ultima/nuvie/pathfinder/astar_path.cpp
index 5b9c9170da0..5fd86c96afc 100644
--- a/engines/ultima/nuvie/pathfinder/astar_path.cpp
+++ b/engines/ultima/nuvie/pathfinder/astar_path.cpp
@@ -33,7 +33,7 @@ AStarPath::AStarPath() : final_node(0) {
void AStarPath::create_path() {
astar_node *i = final_node; // iterator through steps, from back
delete_path();
- Std::vector<astar_node *> reverse_list;
+ Common::Array<astar_node *> reverse_list;
while (i) {
reverse_list.push_back(i);
i = i->parent;
diff --git a/engines/ultima/nuvie/pathfinder/party_path_finder.cpp b/engines/ultima/nuvie/pathfinder/party_path_finder.cpp
index 9fad2a37896..c3916cfc3fe 100644
--- a/engines/ultima/nuvie/pathfinder/party_path_finder.cpp
+++ b/engines/ultima/nuvie/pathfinder/party_path_finder.cpp
@@ -32,8 +32,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
PartyPathFinder::PartyPathFinder(Party *p) : party(p) {
assert(p);
}
@@ -344,14 +342,14 @@ bool PartyPathFinder::try_all_directions(uint32 p, MapCoord target_loc) {
/* Returns a list(vector) of all locations adjacent to 'center', sorted by their
* distance to 'target'. (near to far)
*/
-vector<MapCoord>
+Common::Array<MapCoord>
PartyPathFinder::get_neighbor_tiles(const MapCoord ¢er, const MapCoord &target) {
sint8 rel_x = get_wrapped_rel_dir(target.x, center.x, target.z);
sint8 rel_y = get_wrapped_rel_dir(target.y, center.y, target.z);
- vector<MapCoord> neighbors;
+ Common::Array<MapCoord> neighbors;
for (uint32 dir = 0; dir < 8; dir++) {
MapCoord this_square = center.abs_coords(rel_x, rel_y); // initial square in first iteration
- vector<MapCoord>::iterator i = neighbors.begin();
+ Common::Array<MapCoord>::iterator i = neighbors.begin();
uint32 sorted = 0;
for (; sorted < neighbors.size(); sorted++, i++) {
MapCoord check_square = neighbors[sorted];
@@ -390,7 +388,7 @@ bool PartyPathFinder::bump_member(uint32 bumped_member_num, uint32 member_num) {
sint8 to_member_y = get_wrapped_rel_dir(member_loc.y, bump_from.y, member_loc.z);
// sort neighboring squares by distance to target (closest first)
- vector<MapCoord> neighbors;
+ Common::Array<MapCoord> neighbors;
if (bump_target != bump_from)
neighbors = get_neighbor_tiles(bump_from, bump_target);
else { // sort by distance to leader
diff --git a/engines/ultima/nuvie/pathfinder/party_path_finder.h b/engines/ultima/nuvie/pathfinder/party_path_finder.h
index a6094397da8..3dd07672f29 100644
--- a/engines/ultima/nuvie/pathfinder/party_path_finder.h
+++ b/engines/ultima/nuvie/pathfinder/party_path_finder.h
@@ -84,7 +84,7 @@ protected:
bool leader_moved_diagonally();
bool leader_moved();
- Std::vector<MapCoord> get_neighbor_tiles(const MapCoord ¢er, const MapCoord &target);
+ Common::Array<MapCoord> get_neighbor_tiles(const MapCoord ¢er, const MapCoord &target);
// use party
struct PartyMember get_member(uint32 p) {
diff --git a/engines/ultima/nuvie/pathfinder/seek_path.cpp b/engines/ultima/nuvie/pathfinder/seek_path.cpp
index 03342addf5f..499c4e7c205 100644
--- a/engines/ultima/nuvie/pathfinder/seek_path.cpp
+++ b/engines/ultima/nuvie/pathfinder/seek_path.cpp
@@ -26,8 +26,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
SeekPath::SeekPath() {
}
@@ -69,7 +67,7 @@ bool SeekPath::get_obstacle_tracer(const MapCoord &start, sint32 xdir, sint32 yd
}
/* Returns true if an opening is found along the original line. */
-bool SeekPath::trace_check_obstacle(bool &turned, MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Std::vector<MapCoord> *scan) {
+bool SeekPath::trace_check_obstacle(bool &turned, MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Common::Array<MapCoord> *scan) {
MapCoord obstacle(line.x + xdir, line.y + ydir, line.z);
if (check_loc(obstacle)) { // no obstacle here; able to move closer
if (scan->empty() || scan->back() != line)
@@ -91,7 +89,7 @@ bool SeekPath::trace_check_obstacle(bool &turned, MapCoord &line, sint32 &deltax
return false;
}
-void SeekPath::trace_around_corner(MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Std::vector<MapCoord> *scan) {
+void SeekPath::trace_around_corner(MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Common::Array<MapCoord> *scan) {
line.x -= deltax;
line.y -= deltay; // step back
if (scan->empty() || scan->back() != line)
@@ -107,7 +105,7 @@ void SeekPath::trace_around_corner(MapCoord &line, sint32 &deltax, sint32 &delta
looking for openings towards 'xdir' and 'ydir'. The scan can bend 90 degrees
to get around walls. Returns true if something that looks like an opening
has been found. Trace nodes are placed at turns and where the scan ends. */
-bool SeekPath::trace_obstacle(MapCoord line, sint32 deltax, sint32 deltay, sint32 xdir, sint32 ydir, Std::vector<MapCoord> *scan) {
+bool SeekPath::trace_obstacle(MapCoord line, sint32 deltax, sint32 deltay, sint32 xdir, sint32 ydir, Common::Array<MapCoord> *scan) {
const uint32 scan_max = 8; // number of squares to check before giving up
bool bend = false; // true if the scanning line is rotated 90 degrees
uint32 s = 0;
@@ -128,7 +126,7 @@ bool SeekPath::trace_obstacle(MapCoord line, sint32 deltax, sint32 deltay, sint3
}
// choose which set of nodes traced around an obstacle should be used for a path
-Std::vector<MapCoord> *SeekPath::get_best_scan(const MapCoord &start, const MapCoord &goal) {
+Common::Array<MapCoord> *SeekPath::get_best_scan(const MapCoord &start, const MapCoord &goal) {
if (A_scan.empty() && B_scan.empty())
return 0;
if (A_scan.empty())
@@ -142,7 +140,7 @@ Std::vector<MapCoord> *SeekPath::get_best_scan(const MapCoord &start, const MapC
// copy A or B nodes to the path
void SeekPath::create_path(const MapCoord &start, const MapCoord &goal) {
- vector<MapCoord> *nodes = get_best_scan(start, goal); // points to line A or B
+ Common::Array<MapCoord> *nodes = get_best_scan(start, goal); // points to line A or B
MapCoord prev_node(start);
// these nodes are only at certain locations in the path, so all steps in
diff --git a/engines/ultima/nuvie/pathfinder/seek_path.h b/engines/ultima/nuvie/pathfinder/seek_path.h
index 7cbdfa9f674..b19197647b9 100644
--- a/engines/ultima/nuvie/pathfinder/seek_path.h
+++ b/engines/ultima/nuvie/pathfinder/seek_path.h
@@ -34,13 +34,13 @@ namespace Nuvie {
*/
class SeekPath: public Path {
protected:
- Std::vector<MapCoord> A_scan, B_scan; // nodes of a line scanned by trace_obstacle()
+ Common::Array<MapCoord> A_scan, B_scan; // nodes of a line scanned by trace_obstacle()
void create_path(const MapCoord &start, const MapCoord &goal);
- Std::vector<MapCoord> *get_best_scan(const MapCoord &start, const MapCoord &goal);
+ Common::Array<MapCoord> *get_best_scan(const MapCoord &start, const MapCoord &goal);
void delete_nodes();
- bool trace_check_obstacle(bool &turned, MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Std::vector<MapCoord> *scan);
- void trace_around_corner(MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Std::vector<MapCoord> *scan);
+ bool trace_check_obstacle(bool &turned, MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Common::Array<MapCoord> *scan);
+ void trace_around_corner(MapCoord &line, sint32 &deltax, sint32 &deltay, sint32 &xdir, sint32 &ydir, Common::Array<MapCoord> *scan);
public:
SeekPath();
@@ -55,7 +55,7 @@ public:
}
/* Trace obstacle towards xdir,ydir for a possible opening. */
- bool trace_obstacle(MapCoord line, sint32 deltax, sint32 deltay, sint32 xdir, sint32 ydir, Std::vector<MapCoord> *scan);
+ bool trace_obstacle(MapCoord line, sint32 deltax, sint32 deltay, sint32 xdir, sint32 ydir, Common::Array<MapCoord> *scan);
/* Get two relative directions that a line can travel to trace around an
obstacle towards `xdir',`ydir'. */
bool get_obstacle_tracer(const MapCoord &start, sint32 xdir, sint32 ydir,
diff --git a/engines/ultima/nuvie/script/script.cpp b/engines/ultima/nuvie/script/script.cpp
index 70a7f231e0d..aaa8f5d4b6b 100644
--- a/engines/ultima/nuvie/script/script.cpp
+++ b/engines/ultima/nuvie/script/script.cpp
@@ -3391,7 +3391,7 @@ static int nscript_quake_start(lua_State *L) {
}
static int nscript_new_hit_entities_tbl_var(lua_State *L, ProjectileEffect *effect) {
- vector<MapEntity> *hit_items = effect->get_hit_entities();
+ Common::Array<MapEntity> *hit_items = effect->get_hit_entities();
lua_newtable(L);
@@ -3512,7 +3512,7 @@ static int nscript_projectile_anim_multi(lua_State *L) {
uint16 y = 0;
uint8 z = 0;
- vector<MapCoord> t;
+ Common::Array<MapCoord> t;
for (int i = 1;; i++) {
lua_pushinteger(L, i);
diff --git a/engines/ultima/nuvie/script/script_cutscene.cpp b/engines/ultima/nuvie/script/script_cutscene.cpp
index 0e14e862fe8..374ee03631b 100644
--- a/engines/ultima/nuvie/script/script_cutscene.cpp
+++ b/engines/ultima/nuvie/script/script_cutscene.cpp
@@ -439,7 +439,7 @@ static int nscript_image_load(lua_State *L) {
static int nscript_image_load_all(lua_State *L) {
const char *filename = lua_tostring(L, 1);
- Std::vector<Std::vector<CSImage *> > images = cutScene->load_all_images(filename);
+ Common::Array<Common::Array<CSImage *> > images = cutScene->load_all_images(filename);
if (images.empty()) {
return 0;
@@ -826,7 +826,7 @@ static int nscript_text_load(lua_State *L) {
const char *filename = lua_tostring(L, 1);
uint8 idx = lua_tointeger(L, 2);
- Std::vector<Common::String> text = cutScene->load_text(filename, idx);
+ Common::Array<Common::String> text = cutScene->load_text(filename, idx);
if (text.empty()) {
return 0;
@@ -845,7 +845,7 @@ static int nscript_text_load(lua_State *L) {
static int nscript_midgame_load(lua_State *L) {
const char *filename = lua_tostring(L, 1);
- Std::vector<CSMidGameData> v = cutScene->load_midgame_file(filename);
+ Common::Array<CSMidGameData> v = cutScene->load_midgame_file(filename);
if (v.empty()) {
return 0;
@@ -1303,13 +1303,13 @@ CSImage *ScriptCutscene::load_image(const char *filename, int idx, int sub_idx)
return image;
}
-Std::vector<Std::vector<CSImage *> > ScriptCutscene::load_all_images(const char *filename) {
+Common::Array<Common::Array<CSImage *> > ScriptCutscene::load_all_images(const char *filename) {
Common::Path path;
CSImage *image = nullptr;
config_get_path(config, filename, path);
- Std::vector<Std::vector<CSImage *> > v;
+ Common::Array<Common::Array<CSImage *> > v;
U6Lzw lzw;
U6Lib_n lib_n;
@@ -1326,7 +1326,7 @@ Std::vector<Std::vector<CSImage *> > ScriptCutscene::load_all_images(const char
U6Lib_n lib1;
lib1.open(&io, 4, NUVIE_GAME_MD);
//printf("lib_size = %d\n", lib1.get_num_items());
- Std::vector<CSImage *> v1;
+ Common::Array<CSImage *> v1;
for (uint32 idx1 = 0; idx1 < lib1.get_num_items(); idx1++) {
U6Shape *shp = new U6Shape();
if (shp->load(&lib1, idx1)) {
@@ -1351,7 +1351,7 @@ Std::vector<Std::vector<CSImage *> > ScriptCutscene::load_all_images(const char
}
for (uint32 idx = 0; idx < lib_n.get_num_items(); idx++) {
- Std::vector<CSImage *> v1;
+ Common::Array<CSImage *> v1;
U6Shape *shp = new U6Shape();
if (shp->load(&lib_n, idx)) {
image = new CSImage(shp);
@@ -1370,7 +1370,7 @@ Std::vector<Std::vector<CSImage *> > ScriptCutscene::load_all_images(const char
}
-void load_images_from_lib(Std::vector<CSImage *> *images, U6Lib_n *lib, uint32 index) {
+void load_images_from_lib(Common::Array<CSImage *> *images, U6Lib_n *lib, uint32 index) {
unsigned char *buf = lib->get_item(index, nullptr);
if (buf == nullptr) {
return;
@@ -1390,10 +1390,10 @@ void load_images_from_lib(Std::vector<CSImage *> *images, U6Lib_n *lib, uint32 i
free(buf);
}
-Std::vector<CSMidGameData> ScriptCutscene::load_midgame_file(const char *filename) {
+Common::Array<CSMidGameData> ScriptCutscene::load_midgame_file(const char *filename) {
Common::Path path;
U6Lib_n lib_n;
- Std::vector<CSMidGameData> v;
+ Common::Array<CSMidGameData> v;
nuvie_game_t game_type = Game::get_game()->get_game_type();
config_get_path(config, filename, path);
@@ -1449,10 +1449,10 @@ TransferSaveData ScriptCutscene::load_transfer_save() {
return data;
}
-Std::vector<Common::String> ScriptCutscene::load_text(const char *filename, uint8 idx) {
+Common::Array<Common::String> ScriptCutscene::load_text(const char *filename, uint8 idx) {
Common::Path path;
U6Lib_n lib_n;
- Std::vector<Common::String> v;
+ Common::Array<Common::String> v;
unsigned char *buf = nullptr;
config_get_path(config, filename, path);
diff --git a/engines/ultima/nuvie/script/script_cutscene.h b/engines/ultima/nuvie/script/script_cutscene.h
index 47bc097734c..ef9b2292092 100644
--- a/engines/ultima/nuvie/script/script_cutscene.h
+++ b/engines/ultima/nuvie/script/script_cutscene.h
@@ -105,8 +105,8 @@ struct CSSprite {
};
struct CSMidGameData {
- Std::vector<Common::String> text;
- Std::vector<CSImage *> images;
+ Common::Array<Common::String> text;
+ Common::Array<CSImage *> images;
};
struct TransferSaveData {
@@ -147,14 +147,14 @@ public:
ScriptCutscene(GUI *g, Configuration *cfg, SoundManager *sm);
~ScriptCutscene() override;
- Std::vector<Common::String> load_text(const char *filename, uint8 idx);
+ Common::Array<Common::String> load_text(const char *filename, uint8 idx);
- Std::vector<CSMidGameData> load_midgame_file(const char *filename);
+ Common::Array<CSMidGameData> load_midgame_file(const char *filename);
TransferSaveData load_transfer_save();
CSImage *load_image(const char *filename, int idx, int sub_idx = 0);
- Std::vector<Std::vector<CSImage *> > load_all_images(const char *filename);
+ Common::Array<Common::Array<CSImage *> > load_all_images(const char *filename);
void add_sprite(CSSprite *s) {
sprite_list.push_back(s);
}
diff --git a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
index 98a07279aca..7eff2cfbc34 100644
--- a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
+++ b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
@@ -53,13 +53,13 @@ private:
/**
* An array of audio streams.
*/
- Std::vector<Audio::RewindableAudioStream *> _streams;
+ Common::Array<Audio::RewindableAudioStream *> _streams;
DisposeAfterUse::Flag _disposeAfterUse;
Audio::RewindableAudioStream *_currentStream;
public:
- RandomCollectionAudioStreamImpl(int rate, bool stereo, const Std::vector<Audio::RewindableAudioStream *> &streams, DisposeAfterUse::Flag disposeAfterUse)
+ RandomCollectionAudioStreamImpl(int rate, bool stereo, const Common::Array<Audio::RewindableAudioStream *> &streams, DisposeAfterUse::Flag disposeAfterUse)
: _rate(rate), _stereo(stereo), _finished(false), _streams(streams), _disposeAfterUse(disposeAfterUse) {
if (_streams.size() > 0)
_currentStream = _streams[NUVIE_RAND() % _streams.size()];
@@ -125,7 +125,7 @@ int RandomCollectionAudioStreamImpl::readBuffer(int16 *buffer, const int numSamp
}
RandomCollectionAudioStream *makeRandomCollectionAudioStream(int rate, bool stereo,
- Std::vector<Audio::RewindableAudioStream *> streams, DisposeAfterUse::Flag disposeAfterUse) {
+ Common::Array<Audio::RewindableAudioStream *> streams, DisposeAfterUse::Flag disposeAfterUse) {
return new RandomCollectionAudioStreamImpl(rate, stereo, streams, disposeAfterUse);
}
diff --git a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
index 9192898c084..9b69a56d287 100644
--- a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.h
@@ -42,7 +42,7 @@ public:
/**
* Factory function for a QueuingAudioStream.
*/
-RandomCollectionAudioStream *makeRandomCollectionAudioStream(int rate, bool stereo, Std::vector<Audio::RewindableAudioStream *>streams, DisposeAfterUse::Flag disposeAfterUse);
+RandomCollectionAudioStream *makeRandomCollectionAudioStream(int rate, bool stereo, Common::Array<Audio::RewindableAudioStream *>streams, DisposeAfterUse::Flag disposeAfterUse);
} // End of namespace U6Audio
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/sound/sound.h b/engines/ultima/nuvie/sound/sound.h
index 53fc2501d3b..cba7828a9ba 100644
--- a/engines/ultima/nuvie/sound/sound.h
+++ b/engines/ultima/nuvie/sound/sound.h
@@ -29,8 +29,6 @@
namespace Ultima {
namespace Nuvie {
-using Std::vector;
-
class Sound {
public:
virtual ~Sound() {};
@@ -61,7 +59,7 @@ public:
int i = NUVIE_RAND() % m_Sounds.size();
return m_Sounds[i];
}; //randomly select one from the list
- vector<Sound *> m_Sounds;
+ Common::Array<Sound *> m_Sounds;
};
} // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/sound/sound_manager.cpp b/engines/ultima/nuvie/sound/sound_manager.cpp
index c137656d00b..b30280fdccb 100644
--- a/engines/ultima/nuvie/sound/sound_manager.cpp
+++ b/engines/ultima/nuvie/sound/sound_manager.cpp
@@ -648,7 +648,7 @@ void SoundManager::update_map_sfx() {
Player *p = Game::get_game()->get_player();
MapWindow *mw = Game::get_game()->get_map_window();
- vector < SfxIdType >currentlyActiveSounds;
+ Common::Array < SfxIdType >currentlyActiveSounds;
Common::HashMap < SfxIdType, float >volumeLevels;
p->get_location(&x, &y, &l);
@@ -738,7 +738,7 @@ void SoundManager::update_map_sfx() {
Common::List < SoundManagerSfx >::iterator it;
it = m_ActiveSounds.begin();
while (it != m_ActiveSounds.end()) {
- Std::vector<SfxIdType>::iterator fit;
+ Common::Array<SfxIdType>::iterator fit;
SoundManagerSfx sfx = (*it);
fit = Common::find(currentlyActiveSounds.begin(), currentlyActiveSounds.end(), sfx.sfx_id); //is the sound in the new active list?
if (fit == currentlyActiveSounds.end()) {
diff --git a/engines/ultima/nuvie/sound/towns_sfx_manager.cpp b/engines/ultima/nuvie/sound/towns_sfx_manager.cpp
index 884e615f575..c4d2b4d1160 100644
--- a/engines/ultima/nuvie/sound/towns_sfx_manager.cpp
+++ b/engines/ultima/nuvie/sound/towns_sfx_manager.cpp
@@ -100,7 +100,7 @@ void TownsSfxManager::loadSound1Dat() {
}
// Fire SFX is made up of three individual samples played in a random sequence
- Std::vector<Audio::RewindableAudioStream *> streams;
+ Common::Array<Audio::RewindableAudioStream *> streams;
streams.push_back(new FMtownsDecoderStream(sounds1_dat[6].buf, sounds1_dat[6].len));
streams.push_back(new FMtownsDecoderStream(sounds1_dat[7].buf, sounds1_dat[7].len));
streams.push_back(new FMtownsDecoderStream(sounds1_dat[8].buf, sounds1_dat[8].len));
diff --git a/engines/ultima/shared/std/containers.h b/engines/ultima/shared/std/containers.h
index 936efb1e0dc..975200e7595 100644
--- a/engines/ultima/shared/std/containers.h
+++ b/engines/ultima/shared/std/containers.h
@@ -31,18 +31,4 @@
#include "common/stack.h"
#include "common/util.h"
-namespace Ultima {
-namespace Std {
-
-template<class T>
-class vector : public Common::Array<T> {
-public:
- constexpr vector() : Common::Array<T>() {}
- vector(size_t newSize) : Common::Array<T>(newSize) {}
- vector(size_t newSize, const T elem) : Common::Array<T>(newSize, elem) {}
-};
-
-} // End of namespace Std
-} // End of namespace Ultima
-
#endif
diff --git a/engines/ultima/ultima4/controllers/combat_controller.cpp b/engines/ultima/ultima4/controllers/combat_controller.cpp
index 089b191f0db..369d71f82c7 100644
--- a/engines/ultima/ultima4/controllers/combat_controller.cpp
+++ b/engines/ultima/ultima4/controllers/combat_controller.cpp
@@ -906,7 +906,7 @@ void CombatController::attack(Direction dir, int distance) {
soundPlay(SOUND_PC_ATTACK, false); // PC_ATTACK, melee and ranged
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL,
attacker->getCoords(), 1, range,
weapon->canAttackThroughObjects() ? nullptr : &Tile::canAttackOverTile,
false);
diff --git a/engines/ultima/ultima4/controllers/game_controller.cpp b/engines/ultima/ultima4/controllers/game_controller.cpp
index 716789cd533..d2b45c38d41 100644
--- a/engines/ultima/ultima4/controllers/game_controller.cpp
+++ b/engines/ultima/ultima4/controllers/game_controller.cpp
@@ -810,7 +810,7 @@ void GameController::attack(Direction dir) {
return;
}
- Std::vector<Coords> path = gameGetDirectionalActionPath(
+ Common::Array<Coords> path = gameGetDirectionalActionPath(
MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
1, 1, nullptr, true);
for (const auto &coords : path) {
diff --git a/engines/ultima/ultima4/controllers/intro_controller.cpp b/engines/ultima/ultima4/controllers/intro_controller.cpp
index 828f48cb090..52084c0fd33 100644
--- a/engines/ultima/ultima4/controllers/intro_controller.cpp
+++ b/engines/ultima/ultima4/controllers/intro_controller.cpp
@@ -571,7 +571,7 @@ void IntroController::drawMapAnimated() {
// draw animated objects
for (i = 0; i < INTRO_BASETILE_TABLE_SIZE; i++)
if (_objectStateTable[i].tile != 0) {
- Std::vector<MapTile> tiles;
+ Common::Array<MapTile> tiles;
tiles.push_back(_objectStateTable[i].tile);
tiles.push_back(_binData->_introMap[_objectStateTable[i].x + (_objectStateTable[i].y * INTRO_MAP_WIDTH)]);
_mapArea.drawTile(tiles, false, _objectStateTable[i].x, _objectStateTable[i].y);
@@ -1459,7 +1459,7 @@ void IntroController::addTitle(int x, int y, int w, int h, AnimType method, uint
duration, // total animation time
nullptr, // storage for the source image
nullptr, // storage for the animation frame
- Std::vector<AnimPlot>(),
+ Common::Array<AnimPlot>(),
false
}; // prescaled
_titles.push_back(data);
diff --git a/engines/ultima/ultima4/controllers/intro_controller.h b/engines/ultima/ultima4/controllers/intro_controller.h
index b01a2da60fd..20d64f7b3fe 100644
--- a/engines/ultima/ultima4/controllers/intro_controller.h
+++ b/engines/ultima/ultima4/controllers/intro_controller.h
@@ -52,15 +52,15 @@ public:
bool load();
- Std::vector<MapTile> _introMap;
+ Common::Array<MapTile> _introMap;
byte *_sigData;
byte *_scriptTable;
Tile **_baseTileTable;
byte *_beastie1FrameTable;
byte *_beastie2FrameTable;
- Std::vector<Common::String> _introText;
- Std::vector<Common::String> _introQuestions;
- Std::vector<Common::String> _introGypsy;
+ Common::Array<Common::String> _introText;
+ Common::Array<Common::String> _introQuestions;
+ Common::Array<Common::String> _introGypsy;
};
@@ -386,7 +386,7 @@ private:
int _timeDuration; // total animation time
Image *_srcImage; // storage for the source image
Image *_destImage; // storage for the animation frame
- Std::vector <AnimPlot> _plotData; // plot data
+ Common::Array <AnimPlot> _plotData; // plot data
bool _prescaled;
};
@@ -416,8 +416,8 @@ private:
*/
void skipTitles();
- Std::vector<AnimElement> _titles; // list of title elements
- Std::vector<AnimElement>::iterator _title; // current title element
+ Common::Array<AnimElement> _titles; // list of title elements
+ Common::Array<AnimElement>::iterator _title; // current title element
int _transparentIndex; // palette index for transparency
RGBA _transparentColor; // palette color for transparency
diff --git a/engines/ultima/ultima4/conversation/conversation.cpp b/engines/ultima/ultima4/conversation/conversation.cpp
index e4cb67368cc..3069a853308 100644
--- a/engines/ultima/ultima4/conversation/conversation.cpp
+++ b/engines/ultima/ultima4/conversation/conversation.cpp
@@ -59,7 +59,7 @@ void Response::add(const ResponsePart &part) {
_parts.push_back(part);
}
-const Std::vector<ResponsePart> &Response::getParts() const {
+const Common::Array<ResponsePart> &Response::getParts() const {
return _parts;
}
@@ -111,7 +111,7 @@ DynamicResponse::~DynamicResponse() {
delete _currentResponse;
}
-const Std::vector<ResponsePart> &DynamicResponse::getParts() const {
+const Common::Array<ResponsePart> &DynamicResponse::getParts() const {
// blah, must cast away constness
const_cast<DynamicResponse *>(this)->_currentResponse = (*_generator)(this);
return _currentResponse->getParts();
diff --git a/engines/ultima/ultima4/conversation/conversation.h b/engines/ultima/ultima4/conversation/conversation.h
index d6c9bcf585c..dcfdb1d015d 100644
--- a/engines/ultima/ultima4/conversation/conversation.h
+++ b/engines/ultima/ultima4/conversation/conversation.h
@@ -84,7 +84,7 @@ public:
void add(const ResponsePart &part);
- virtual const Std::vector<ResponsePart> &getParts() const;
+ virtual const Common::Array<ResponsePart> &getParts() const;
operator Common::String() const;
@@ -93,7 +93,7 @@ public:
private:
int _references;
- Std::vector<ResponsePart> _parts;
+ Common::Array<ResponsePart> _parts;
};
/**
@@ -106,7 +106,7 @@ public:
DynamicResponse(Response * (*generator)(const DynamicResponse *), const Common::String ¶m = "");
virtual ~DynamicResponse();
- const Std::vector<ResponsePart> &getParts() const override;
+ const Common::Array<ResponsePart> &getParts() const override;
const Common::String &getParam() const {
return _param;
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp b/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
index 3cfde1674f3..a38255dac1b 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
+++ b/engines/ultima/ultima4/conversation/dialogueloader_hw.cpp
@@ -52,7 +52,7 @@ Response *hawkwindGetIntro(const DynamicResponse *dynResp);
* A special case dialogue loader for Hawkwind.
*/
Dialogue *U4HWDialogueLoader::load(Common::SeekableReadStream *source) {
- Std::vector<Common::String> &hawkwindText = g_ultima->_hawkwindText;
+ Common::Array<Common::String> &hawkwindText = g_ultima->_hawkwindText;
hawkwindText = u4read_stringtable("hawkwind");
Dialogue *dlg = new Dialogue();
@@ -91,7 +91,7 @@ Dialogue *U4HWDialogueLoader::load(Common::SeekableReadStream *source) {
Response *hawkwindGetAdvice(const DynamicResponse *dynResp) {
Common::String text;
int virtue = -1, virtueLevel = -1;
- Std::vector<Common::String> &hawkwindText = g_ultima->_hawkwindText;
+ Common::Array<Common::String> &hawkwindText = g_ultima->_hawkwindText;
/* check if asking about a virtue */
for (int v = 0; v < VIRT_MAX; v++) {
@@ -120,7 +120,7 @@ Response *hawkwindGetAdvice(const DynamicResponse *dynResp) {
Response *hawkwindGetIntro(const DynamicResponse *dynResp) {
Response *intro = new Response("");
- Std::vector<Common::String> &hawkwindText = g_ultima->_hawkwindText;
+ Common::Array<Common::String> &hawkwindText = g_ultima->_hawkwindText;
if (g_context->_party->member(0)->getStatus() == STAT_SLEEPING ||
g_context->_party->member(0)->getStatus() == STAT_DEAD) {
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_lb.cpp b/engines/ultima/ultima4/conversation/dialogueloader_lb.cpp
index 89036fb273b..3ba2c447173 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_lb.cpp
+++ b/engines/ultima/ultima4/conversation/dialogueloader_lb.cpp
@@ -39,8 +39,8 @@ Response *lordBritishGetIntro(const DynamicResponse *resp);
* based on the current party status.
*/
Dialogue *U4LBDialogueLoader::load(Common::SeekableReadStream *source) {
- Std::vector<Common::String> lbKeywords = u4read_stringtable("lb_keywords");
- Std::vector<Common::String> lbText = u4read_stringtable("lb_text");
+ Common::Array<Common::String> lbKeywords = u4read_stringtable("lb_keywords");
+ Common::Array<Common::String> lbText = u4read_stringtable("lb_text");
Dialogue *dlg = new Dialogue();
dlg->setTurnAwayProb(0);
diff --git a/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp b/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
index b1e6066dc6a..d6580aaff02 100644
--- a/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
+++ b/engines/ultima/ultima4/conversation/dialogueloader_tlk.cpp
@@ -45,7 +45,7 @@ Dialogue *U4TlkDialogueLoader::load(Common::SeekableReadStream *source) {
return nullptr;
char *ptr = &tlk_buffer[3];
- Std::vector<Common::String> strings;
+ Common::Array<Common::String> strings;
for (int i = 0; i < 12; i++) {
strings.push_back(ptr);
ptr += strlen(ptr) + 1;
diff --git a/engines/ultima/ultima4/core/config.cpp b/engines/ultima/ultima4/core/config.cpp
index c6e7e174051..55f081458eb 100644
--- a/engines/ultima/ultima4/core/config.cpp
+++ b/engines/ultima/ultima4/core/config.cpp
@@ -45,8 +45,8 @@ ConfigElement Config::getElement(const Common::String &name) const {
return ConfigElement(node);
}
-Std::vector<Common::String> Config::getGames() {
- Std::vector<Common::String> result;
+Common::Array<Common::String> Config::getGames() {
+ Common::Array<Common::String> result;
result.push_back("Ultima IV");
return result;
}
@@ -112,9 +112,9 @@ int ConfigElement::getEnum(const Common::String &name, const char *const enumVal
error("invalid enum value for %s: %s", name.c_str(), str.c_str());
}
-Std::vector<ConfigElement> ConfigElement::getChildren() const {
+Common::Array<ConfigElement> ConfigElement::getChildren() const {
const Common::Array<Shared::XMLNode *> &children = _node->children();
- Std::vector<ConfigElement> result;
+ Common::Array<ConfigElement> result;
for (const auto &c : children)
result.push_back(c);
diff --git a/engines/ultima/ultima4/core/config.h b/engines/ultima/ultima4/core/config.h
index 8db20c96211..1bc740edf48 100644
--- a/engines/ultima/ultima4/core/config.h
+++ b/engines/ultima/ultima4/core/config.h
@@ -116,7 +116,7 @@ public:
ConfigElement getElement(const Common::String &name) const;
- static Std::vector<Common::String> getGames();
+ static Common::Array<Common::String> getGames();
static void setGame(const Common::String &name);
};
@@ -146,7 +146,7 @@ public:
bool getBool(const Common::String &name) const;
int getEnum(const Common::String &name, const char *const enumValues[]) const;
- Std::vector<ConfigElement> getChildren() const;
+ Common::Array<ConfigElement> getChildren() const;
const Shared::XMLNode *getNode() const {
return _node;
diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index 087de584656..0360bc1934c 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -667,7 +667,7 @@ bool Debugger::cmdFire(int argc, const char **argv) {
}
// nothing (not even mountains!) can block cannonballs
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), broadsidesDirs, g_context->_location->_coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), broadsidesDirs, g_context->_location->_coords,
1, 3, nullptr, false);
for (const auto &coords : path) {
if (fireAt(coords, true))
@@ -827,7 +827,7 @@ bool Debugger::cmdJimmy(int argc, const char **argv) {
if (dir == DIR_NONE)
return isDebuggerActive();
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
1, 1, nullptr, true);
for (const auto &coords : path) {
if (jimmyAt(coords))
@@ -970,7 +970,7 @@ bool Debugger::cmdOpenDoor(int argc, const char **argv) {
if (dir == DIR_NONE)
return isDebuggerActive();
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
1, 1, nullptr, true);
for (const auto &coords : path) {
if (openAt(coords))
@@ -1224,7 +1224,7 @@ bool Debugger::cmdTalk(int argc, const char **argv) {
if (dir == DIR_NONE)
return isDebuggerActive();
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, g_context->_location->_coords,
1, 2, &Tile::canTalkOverTile, true);
for (const auto &coords : path) {
if (talkAt(coords))
@@ -1381,7 +1381,7 @@ bool Debugger::cmdDestroy(int argc, const char **argv) {
if (dir == DIR_NONE)
return isDebuggerActive();
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir),
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir),
MASK_DIR_ALL, g_context->_location->_coords, 1, 1, nullptr, true);
for (const auto &coords : path) {
if (destroyAt(coords)) {
diff --git a/engines/ultima/ultima4/core/observable.h b/engines/ultima/ultima4/core/observable.h
index c0edf471264..3df7e7f216e 100644
--- a/engines/ultima/ultima4/core/observable.h
+++ b/engines/ultima/ultima4/core/observable.h
@@ -47,7 +47,7 @@ public:
Observable() : _changed(false) {}
void addObserver(Observer<O, A> *o) {
- typename Std::vector< Observer<O, A> *>::iterator i;
+ typename Common::Array< Observer<O, A> *>::iterator i;
i = Common::find(_observers.begin(), _observers.end(), o);
if (i == _observers.end())
_observers.push_back(o);
@@ -58,7 +58,7 @@ public:
}
void deleteObserver(Observer<O, A> *o) {
- typename Std::vector< Observer<O, A> *>::iterator i;
+ typename Common::Array< Observer<O, A> *>::iterator i;
i = Common::find(_observers.begin(), _observers.end(), o);
if (i != _observers.end())
_observers.erase(i);
@@ -79,7 +79,7 @@ public:
// vector iterators are invalidated if erase is called, so a copy
// is used to prevent problems if the observer removes itself (or
// otherwise changes the observer list)
- typename Std::vector< Observer<O, A> *> tmp = _observers;
+ typename Common::Array< Observer<O, A> *> tmp = _observers;
clearChanged();
@@ -98,7 +98,7 @@ protected:
private:
bool _changed;
- Std::vector< Observer<O, A> *> _observers;
+ Common::Array< Observer<O, A> *> _observers;
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/core/settings.cpp b/engines/ultima/ultima4/core/settings.cpp
index 5b3fc2e4844..e4b079a9481 100644
--- a/engines/ultima/ultima4/core/settings.cpp
+++ b/engines/ultima/ultima4/core/settings.cpp
@@ -182,7 +182,7 @@ void Settings::synchronize(Shared::ConfSerializer &s) {
s.syncAsString("logging", _logging, DEFAULT_LOGGING);
}
-const Std::vector<Common::String> &Settings::getBattleDiffs() {
+const Common::Array<Common::String> &Settings::getBattleDiffs() {
return _battleDiffs;
}
diff --git a/engines/ultima/ultima4/core/settings.h b/engines/ultima/ultima4/core/settings.h
index 66a8293e6b1..6da37482d93 100644
--- a/engines/ultima/ultima4/core/settings.h
+++ b/engines/ultima/ultima4/core/settings.h
@@ -148,7 +148,7 @@ class Settings : public SettingsData, public Observable<Settings *> {
typedef Common::HashMap<Common::String, Common::String> SettingsMap;
private:
static Settings *_instance;
- Std::vector<Common::String> _battleDiffs;
+ Common::Array<Common::String> _battleDiffs;
private:
/**
* Default contructor. Settings is a singleton so this is private.
@@ -174,7 +174,7 @@ public:
*/
bool write();
- const Std::vector<Common::String> &getBattleDiffs();
+ const Common::Array<Common::String> &getBattleDiffs();
};
/* the global settings */
diff --git a/engines/ultima/ultima4/core/utils.cpp b/engines/ultima/ultima4/core/utils.cpp
index 2e55b1303dc..c715241fbdc 100644
--- a/engines/ultima/ultima4/core/utils.cpp
+++ b/engines/ultima/ultima4/core/utils.cpp
@@ -80,8 +80,8 @@ Common::String xu4_to_string(int val) {
return buffer;
}
-Std::vector<Common::String> split(const Common::String &s, const Common::String &separators) {
- Std::vector<Common::String> result;
+Common::Array<Common::String> split(const Common::String &s, const Common::String &separators) {
+ Common::Array<Common::String> result;
Common::String current;
for (unsigned i = 0; i < s.size(); i++) {
diff --git a/engines/ultima/ultima4/core/utils.h b/engines/ultima/ultima4/core/utils.h
index bc8b9d66337..261277f6bdc 100644
--- a/engines/ultima/ultima4/core/utils.h
+++ b/engines/ultima/ultima4/core/utils.h
@@ -116,7 +116,7 @@ Common::String xu4_to_string(int val);
* Splits a Common::String into substrings, divided by the charactars in
* separators. Multiple adjacent separators are treated as one.
*/
-Std::vector<Common::String> split(const Common::String &s, const Common::String &separators);
+Common::Array<Common::String> split(const Common::String &s, const Common::String &separators);
} // End of namespace Ultima4
} // End of namespace Ultima
diff --git a/engines/ultima/ultima4/events/event_handler.h b/engines/ultima/ultima4/events/event_handler.h
index 5f3ee7d0a40..0e8b3325779 100644
--- a/engines/ultima/ultima4/events/event_handler.h
+++ b/engines/ultima/ultima4/events/event_handler.h
@@ -99,7 +99,7 @@ protected:
static bool _controllerDone;
static bool _ended;
TimedEventMgr _timer;
- Std::vector<Controller *> _controllers;
+ Common::Array<Controller *> _controllers;
MouseAreaList _mouseAreaSets;
updateScreenCallback _updateScreen;
public:
diff --git a/engines/ultima/ultima4/filesys/u4file.cpp b/engines/ultima/ultima4/filesys/u4file.cpp
index cd773135d8c..4e79611bde6 100644
--- a/engines/ultima/ultima4/filesys/u4file.cpp
+++ b/engines/ultima/ultima4/filesys/u4file.cpp
@@ -25,12 +25,12 @@
namespace Ultima {
namespace Ultima4 {
-Std::vector<Common::String> u4read_stringtable(const Common::String &filename) {
+Common::Array<Common::String> u4read_stringtable(const Common::String &filename) {
Common::File f;
if (!f.open(Common::Path(Common::String::format("data/text/%s.dat", filename.c_str()))))
error("Could not open string table '%s'", filename.c_str());
- Std::vector<Common::String> strs;
+ Common::Array<Common::String> strs;
Common::String line;
int64 filesize = f.size();
diff --git a/engines/ultima/ultima4/filesys/u4file.h b/engines/ultima/ultima4/filesys/u4file.h
index b3e5b386e09..bb0a78cf474 100644
--- a/engines/ultima/ultima4/filesys/u4file.h
+++ b/engines/ultima/ultima4/filesys/u4file.h
@@ -33,7 +33,7 @@ namespace Ultima4 {
* are read from the given offset, or the current file position if
* offset is -1.
*/
-extern Std::vector<Common::String> u4read_stringtable(const Common::String &filename);
+extern Common::Array<Common::String> u4read_stringtable(const Common::String &filename);
} // End of namespace Ultima4
} // End of namespace Ultima
diff --git a/engines/ultima/ultima4/game/armor.cpp b/engines/ultima/ultima4/game/armor.cpp
index 791e68e6975..2bf5e7c7156 100644
--- a/engines/ultima/ultima4/game/armor.cpp
+++ b/engines/ultima/ultima4/game/armor.cpp
@@ -67,7 +67,7 @@ void Armors::loadConf() {
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> armorConfs = config->getElement("armors").getChildren();
+ Common::Array<ConfigElement> armorConfs = config->getElement("armors").getChildren();
for (const auto &i : armorConfs) {
if (i.getName() != "armor")
continue;
@@ -84,7 +84,7 @@ Armor::Armor(ArmorType armorType, const ConfigElement &conf) :
_name = conf.getString("name");
_defense = conf.getInt("defense");
- Std::vector<ConfigElement> contraintConfs = conf.getChildren();
+ Common::Array<ConfigElement> contraintConfs = conf.getChildren();
for (const auto &i : contraintConfs) {
byte useMask = 0;
diff --git a/engines/ultima/ultima4/game/armor.h b/engines/ultima/ultima4/game/armor.h
index 51ca648a550..465b53c622f 100644
--- a/engines/ultima/ultima4/game/armor.h
+++ b/engines/ultima/ultima4/game/armor.h
@@ -60,7 +60,7 @@ private:
//unsigned short _mask;
};
-class Armors : public Std::vector<Armor *> {
+class Armors : public Common::Array<Armor *> {
private:
void loadConf();
bool _confLoaded;
diff --git a/engines/ultima/ultima4/game/context.h b/engines/ultima/ultima4/game/context.h
index d14bd8f21aa..e72a73f1520 100644
--- a/engines/ultima/ultima4/game/context.h
+++ b/engines/ultima/ultima4/game/context.h
@@ -80,7 +80,7 @@ public:
/**
* Provides scripts with information
*/
- Common::String translate(Std::vector<Common::String> &parts) override {
+ Common::String translate(Common::Array<Common::String> &parts) override {
if (parts.size() == 1) {
if (parts[0] == "wind")
return getDirectionName(static_cast<Direction>(_windDirection));
diff --git a/engines/ultima/ultima4/game/creature.cpp b/engines/ultima/ultima4/game/creature.cpp
index b612a68d597..80f9f7f8972 100644
--- a/engines/ultima/ultima4/game/creature.cpp
+++ b/engines/ultima/ultima4/game/creature.cpp
@@ -333,7 +333,7 @@ bool Creature::specialAction() {
Note: Monsters in settlements in U3 do fire on party
*/
if (mapdist <= 3 && xu4_random(2) == 0 && (g_context->_location->_context & CTX_CITY) == 0) {
- Std::vector<Coords> path = gameGetDirectionalActionPath(dir, MASK_DIR_ALL, _coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(dir, MASK_DIR_ALL, _coords,
1, 3, nullptr, false);
for (const auto &coords : path) {
if (creatureRangeAttack(coords, this))
@@ -354,7 +354,7 @@ bool Creature::specialAction() {
((broadsidesDirs & dir) > 0)) { /* pirate ship is firing broadsides */
// nothing (not even mountains!) can block cannonballs
- Std::vector<Coords> path = gameGetDirectionalActionPath(dir, broadsidesDirs, _coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(dir, broadsidesDirs, _coords,
1, 3, nullptr, false);
for (const auto &coords : path) {
if (fireAt(coords, false))
@@ -595,7 +595,7 @@ void Creature::act(CombatController *controller) {
soundPlay(SOUND_NPC_ATTACK, false); // NPC_ATTACK, ranged
- Std::vector<Coords> path = gameGetDirectionalActionPath(dir, MASK_DIR_ALL, m_coords,
+ Common::Array<Coords> path = gameGetDirectionalActionPath(dir, MASK_DIR_ALL, m_coords,
1, 11, &Tile::canAttackOverTile, false);
bool hit = false;
for (const auto &coords : path) {
@@ -891,7 +891,7 @@ CreatureMgr *CreatureMgr::getInstance() {
void CreatureMgr::loadAll() {
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> creatureConfs = config->getElement("creatures").getChildren();
+ Common::Array<ConfigElement> creatureConfs = config->getElement("creatures").getChildren();
for (const auto &i : creatureConfs) {
if (i.getName() != "creature")
diff --git a/engines/ultima/ultima4/game/creature.h b/engines/ultima/ultima4/game/creature.h
index 08efa28ae74..1d5e51ebde2 100644
--- a/engines/ultima/ultima4/game/creature.h
+++ b/engines/ultima/ultima4/game/creature.h
@@ -36,7 +36,7 @@ class Tile;
typedef unsigned short CreatureId;
typedef Common::HashMap<CreatureId, class Creature *> CreatureMap;
-typedef Std::vector<class Creature *> CreatureVector;
+typedef Common::Array<class Creature *> CreatureVector;
#define MAX_CREATURES 128
diff --git a/engines/ultima/ultima4/game/game.cpp b/engines/ultima/ultima4/game/game.cpp
index d94e4da287f..35b26524c8e 100644
--- a/engines/ultima/ultima4/game/game.cpp
+++ b/engines/ultima/ultima4/game/game.cpp
@@ -475,8 +475,8 @@ bool creatureRangeAttack(const Coords &coords, Creature *m) {
return false;
}
-Std::vector<Coords> gameGetDirectionalActionPath(int dirmask, int validDirections, const Coords &origin, int minDistance, int maxDistance, bool (*blockedPredicate)(const Tile *tile), bool includeBlocked) {
- Std::vector<Coords> path;
+Common::Array<Coords> gameGetDirectionalActionPath(int dirmask, int validDirections, const Coords &origin, int minDistance, int maxDistance, bool (*blockedPredicate)(const Tile *tile), bool includeBlocked) {
+ Common::Array<Coords> path;
Direction dirx = DIR_NONE,
diry = DIR_NONE;
diff --git a/engines/ultima/ultima4/game/game.h b/engines/ultima/ultima4/game/game.h
index 90de34ea74f..57f47f7db4f 100644
--- a/engines/ultima/ultima4/game/game.h
+++ b/engines/ultima/ultima4/game/game.h
@@ -145,7 +145,7 @@ void gameSetActivePlayer(int player);
* fails. If a tile is blocked, that tile is included in the path
* only if includeBlocked is true.
*/
-Std::vector<Coords> gameGetDirectionalActionPath(int dirmask, int validDirections, const Coords &origin, int minDistance, int maxDistance, bool (*blockedPredicate)(const Tile *tile), bool includeBlocked);
+Common::Array<Coords> gameGetDirectionalActionPath(int dirmask, int validDirections, const Coords &origin, int minDistance, int maxDistance, bool (*blockedPredicate)(const Tile *tile), bool includeBlocked);
} // End of namespace Ultima4
} // End of namespace Ultima
diff --git a/engines/ultima/ultima4/game/person.cpp b/engines/ultima/ultima4/game/person.cpp
index 6bcf68915e6..48ac6dc48e8 100644
--- a/engines/ultima/ultima4/game/person.cpp
+++ b/engines/ultima/ultima4/game/person.cpp
@@ -351,7 +351,7 @@ Common::String Person::getIntro(Conversation *cnv) {
Common::String Person::processResponse(Conversation *cnv, Response *response) {
Common::String text;
- const Std::vector<ResponsePart> &parts = response->getParts();
+ const Common::Array<ResponsePart> &parts = response->getParts();
for (const auto &i : parts) {
// check for command triggers
@@ -437,7 +437,7 @@ Common::String Person::getResponse(Conversation *cnv, const char *inquiry) {
}
else if (settings._debug && scumm_strnicmp(inquiry, "dump", 4) == 0) {
- Std::vector<Common::String> words = split(inquiry, " \t");
+ Common::Array<Common::String> words = split(inquiry, " \t");
if (words.size() <= 1)
reply = _dialogue->dump("");
else
diff --git a/engines/ultima/ultima4/game/player.cpp b/engines/ultima/ultima4/game/player.cpp
index 606775476a9..566e2a36d34 100644
--- a/engines/ultima/ultima4/game/player.cpp
+++ b/engines/ultima/ultima4/game/player.cpp
@@ -65,7 +65,7 @@ void PartyMember::notifyOfChange() {
}
}
-Common::String PartyMember::translate(Std::vector<Common::String> &parts) {
+Common::String PartyMember::translate(Common::Array<Common::String> &parts) {
if (parts.size() == 0)
return "";
else if (parts.size() == 1) {
@@ -576,7 +576,7 @@ void Party::notifyOfChange(PartyMember *pm, PartyEvent::Type eventType) {
notifyObservers(event);
}
-Common::String Party::translate(Std::vector<Common::String> &parts) {
+Common::String Party::translate(Common::Array<Common::String> &parts) {
if (parts.size() == 0)
return "";
else if (parts.size() == 1) {
@@ -615,7 +615,7 @@ Common::String Party::translate(Std::vector<Common::String> &parts) {
} else if (parts.size() >= 2) {
if (parts[0].findFirstOf("member") == 0) {
// Make a new parts list, but remove the first item
- Std::vector<Common::String> new_parts = parts;
+ Common::Array<Common::String> new_parts = parts;
new_parts.erase(new_parts.begin());
// Find the member we'll be working with
diff --git a/engines/ultima/ultima4/game/player.h b/engines/ultima/ultima4/game/player.h
index b5492f7eee2..476f8818848 100644
--- a/engines/ultima/ultima4/game/player.h
+++ b/engines/ultima/ultima4/game/player.h
@@ -37,7 +37,7 @@ class Armor;
class Party;
class Weapon;
-typedef Std::vector<class PartyMember *> PartyMemberVector;
+typedef Common::Array<class PartyMember *> PartyMemberVector;
#define ALL_PLAYERS -1
@@ -113,7 +113,7 @@ public:
/**
* Used to translate script values into something useful
*/
- Common::String translate(Std::vector<Common::String> &parts) override;
+ Common::String translate(Common::Array<Common::String> &parts) override;
// Accessor methods
int getHp() const override;
@@ -280,7 +280,7 @@ public:
PartyMember *_player;
};
-typedef Std::vector<PartyMember *> PartyMemberVector;
+typedef Common::Array<PartyMember *> PartyMemberVector;
class Party : public Observable<Party *, PartyEvent &>, public Script::Provider {
friend class PartyMember;
@@ -294,7 +294,7 @@ public:
void notifyOfChange(PartyMember *partyMember = 0, PartyEvent::Type = PartyEvent::GENERIC);
// Used to translate script values into something useful
- Common::String translate(Std::vector<Common::String> &parts) override;
+ Common::String translate(Common::Array<Common::String> &parts) override;
void adjustFood(int food);
void adjustGold(int gold);
diff --git a/engines/ultima/ultima4/game/script.cpp b/engines/ultima/ultima4/game/script.cpp
index 0d8cc74ca57..248e120d4c3 100644
--- a/engines/ultima/ultima4/game/script.cpp
+++ b/engines/ultima/ultima4/game/script.cpp
@@ -645,7 +645,7 @@ void Script::translate(Common::String *text) {
provider = item.substr(0, index);
to_find = item.substr(index + 1);
if (_providers.find(provider) != _providers.end()) {
- Std::vector<Common::String> parts = split(to_find, ":");
+ Common::Array<Common::String> parts = split(to_find, ":");
Provider *p = _providers[provider];
prop = p->translate(parts);
}
diff --git a/engines/ultima/ultima4/game/script.h b/engines/ultima/ultima4/game/script.h
index ceeaccd6d1c..ca19729fd56 100644
--- a/engines/ultima/ultima4/game/script.h
+++ b/engines/ultima/ultima4/game/script.h
@@ -56,7 +56,7 @@ public:
class Provider {
public:
virtual ~Provider() {}
- virtual Common::String translate(Std::vector<Common::String> &parts) = 0;
+ virtual Common::String translate(Common::Array<Common::String> &parts) = 0;
};
private:
diff --git a/engines/ultima/ultima4/game/spell.cpp b/engines/ultima/ultima4/game/spell.cpp
index b0053b5c859..6736afc677e 100644
--- a/engines/ultima/ultima4/game/spell.cpp
+++ b/engines/ultima/ultima4/game/spell.cpp
@@ -352,7 +352,7 @@ void Spells::spellMagicAttack(const Common::String &tilename, Direction dir, int
xu4_random((maxDamage + 1) - minDamage) + minDamage :
maxDamage;
- Std::vector<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, (*party)[controller->getFocus()]->getCoords(),
+ Common::Array<Coords> path = gameGetDirectionalActionPath(MASK_DIR(dir), MASK_DIR_ALL, (*party)[controller->getFocus()]->getCoords(),
1, 11, Tile::canAttackOverTile, false);
for (const auto &coords : path) {
if (spellMagicAttackAt(coords, tile, attackDamage))
diff --git a/engines/ultima/ultima4/game/weapon.cpp b/engines/ultima/ultima4/game/weapon.cpp
index 35d945cf60c..c2860428d9e 100644
--- a/engines/ultima/ultima4/game/weapon.cpp
+++ b/engines/ultima/ultima4/game/weapon.cpp
@@ -67,7 +67,7 @@ void Weapons::loadConf() {
_confLoaded = true;
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> weaponConfs = config->getElement("weapons").getChildren();
+ Common::Array<ConfigElement> weaponConfs = config->getElement("weapons").getChildren();
for (const auto &i : weaponConfs) {
if (i.getName() != "weapon")
continue;
@@ -136,7 +136,7 @@ Weapon::Weapon(WeaponType weaponType, const ConfigElement &conf)
_leaveTile = conf.getString("leavetile");
}
- Std::vector<ConfigElement> contraintConfs = conf.getChildren();
+ Common::Array<ConfigElement> contraintConfs = conf.getChildren();
for (const auto &i : contraintConfs) {
byte mask = 0;
diff --git a/engines/ultima/ultima4/gfx/imageloader_u4.cpp b/engines/ultima/ultima4/gfx/imageloader_u4.cpp
index 30540d98342..25a8090ee2e 100644
--- a/engines/ultima/ultima4/gfx/imageloader_u4.cpp
+++ b/engines/ultima/ultima4/gfx/imageloader_u4.cpp
@@ -192,7 +192,7 @@ const byte *U4PaletteLoader::loadEgaPalette() {
_egaPalette = new byte[16 * 3];
- Std::vector<ConfigElement> paletteConf = config->getElement("egaPalette").getChildren();
+ Common::Array<ConfigElement> paletteConf = config->getElement("egaPalette").getChildren();
for (const auto &i : paletteConf) {
if (i.getName() != "color")
diff --git a/engines/ultima/ultima4/gfx/imagemgr.cpp b/engines/ultima/ultima4/gfx/imagemgr.cpp
index e37b31b1ac7..52893de785a 100644
--- a/engines/ultima/ultima4/gfx/imagemgr.cpp
+++ b/engines/ultima/ultima4/gfx/imagemgr.cpp
@@ -102,7 +102,7 @@ void ImageMgr::init() {
* register all the images declared in the config files
*/
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> graphicsConf = config->getElement("graphics").getChildren();
+ Common::Array<ConfigElement> graphicsConf = config->getElement("graphics").getChildren();
for (const auto &conf : graphicsConf) {
if (conf.getName() == "imageset") {
ImageSet *set = loadImageSetFromConf(conf);
@@ -128,7 +128,7 @@ ImageSet *ImageMgr::loadImageSetFromConf(const ConfigElement &conf) {
set->_location = conf.getString("location");
set->_extends = conf.getString("extends");
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "image") {
ImageInfo *info = loadImageInfoFromConf(i);
@@ -161,7 +161,7 @@ ImageInfo *ImageMgr::loadImageInfoFromConf(const ConfigElement &conf) {
info->_fixup = static_cast<ImageFixup>(conf.getEnum("fixup", fixupEnumStrings));
info->_image = nullptr;
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "subimage") {
SubImage *subimage = loadSubImageFromConf(info, i);
@@ -688,7 +688,7 @@ void ImageMgr::freeIntroBackgrounds() {
}
}
-const Std::vector<Common::String> &ImageMgr::getSetNames() {
+const Common::Array<Common::String> &ImageMgr::getSetNames() {
return _imageSetNames;
}
diff --git a/engines/ultima/ultima4/gfx/imagemgr.h b/engines/ultima/ultima4/gfx/imagemgr.h
index 6c54f4bbac9..fecbda0b1ca 100644
--- a/engines/ultima/ultima4/gfx/imagemgr.h
+++ b/engines/ultima/ultima4/gfx/imagemgr.h
@@ -144,7 +144,7 @@ public:
* Free up any background images used only in the animations.
*/
void freeIntroBackgrounds();
- const Std::vector<Common::String> &getSetNames();
+ const Common::Array<Common::String> &getSetNames();
Common::File *getImageFile(ImageInfo *info);
bool imageExists(ImageInfo *info);
@@ -202,7 +202,7 @@ private:
static ImageMgr *_instance;
Common::HashMap<Common::String, ImageSet *> _imageSets;
- Std::vector<Common::String> _imageSetNames;
+ Common::Array<Common::String> _imageSetNames;
ImageSet *_baseSet;
ImageInfo _screenInfo;
uint *_abyssData;
diff --git a/engines/ultima/ultima4/gfx/screen.cpp b/engines/ultima/ultima4/gfx/screen.cpp
index 785ab3eef10..a8ae930c0a7 100644
--- a/engines/ultima/ultima4/gfx/screen.cpp
+++ b/engines/ultima/ultima4/gfx/screen.cpp
@@ -344,7 +344,7 @@ void Screen::screenMessage(const char *fmt, ...) {
void Screen::screenLoadGraphicsFromConf() {
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> graphicsConf = config->getElement("graphics").getChildren();
+ Common::Array<ConfigElement> graphicsConf = config->getElement("graphics").getChildren();
for (const auto &conf : graphicsConf) {
if (conf.getName() == "layout")
@@ -381,7 +381,7 @@ Layout *Screen::screenLoadLayoutFromConf(const ConfigElement &conf) {
layout->_name = conf.getString("name");
layout->_type = static_cast<LayoutType>(conf.getEnum("type", typeEnumStrings));
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "tileshape") {
layout->_tileShape.x = i.getInt("width");
@@ -397,7 +397,7 @@ Layout *Screen::screenLoadLayoutFromConf(const ConfigElement &conf) {
return layout;
}
-Std::vector<MapTile> Screen::screenViewportTile(uint width, uint height, int x, int y, bool &focus) {
+Common::Array<MapTile> Screen::screenViewportTile(uint width, uint height, int x, int y, bool &focus) {
MapCoords center = g_context->_location->_coords;
static MapTile grass = g_context->_location->_map->_tileSet->getByName("grass")->getId();
@@ -418,7 +418,7 @@ Std::vector<MapTile> Screen::screenViewportTile(uint width, uint height, int x,
/* off the edge of the map: pad with grass tiles */
if (MAP_IS_OOB(g_context->_location->_map, tc)) {
focus = false;
- Std::vector<MapTile> result;
+ Common::Array<MapTile> result;
result.push_back(grass);
return result;
}
@@ -434,7 +434,7 @@ bool Screen::screenTileUpdate(TileView *view, const Coords &coords, bool redraw)
bool focus;
MapCoords mc(coords);
mc.wrap(g_context->_location->_map);
- Std::vector<MapTile> tiles = g_context->_location->tilesAt(mc, focus);
+ Common::Array<MapTile> tiles = g_context->_location->tilesAt(mc, focus);
// Get the screen coordinates
int x = coords.x;
@@ -474,7 +474,7 @@ void Screen::screenUpdate(TileView *view, bool showmap, bool blackout) {
int x, y;
- Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H];
+ Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H];
bool viewportFocus[VIEWPORT_W][VIEWPORT_H];
for (y = 0; y < VIEWPORT_H; y++) {
@@ -687,7 +687,7 @@ void Screen::screenSetCursorPos(int x, int y) {
_cursorPos.y = y;
}
-void Screen::screenFindLineOfSight(Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]) {
+void Screen::screenFindLineOfSight(Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]) {
int x, y;
if (!g_context)
@@ -722,7 +722,7 @@ void Screen::screenFindLineOfSight(Std::vector<MapTile> viewportTiles[VIEWPORT_W
error("unknown line of sight style %s!\n", settings._lineOfSight.c_str());
}
-void Screen::screenFindLineOfSightDOS(Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]) {
+void Screen::screenFindLineOfSightDOS(Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]) {
int x, y;
_los[VIEWPORT_W / 2][VIEWPORT_H / 2] = 1;
@@ -802,7 +802,7 @@ void Screen::screenFindLineOfSightDOS(Std::vector<MapTile> viewportTiles[VIEWPOR
}
}
-void Screen::screenFindLineOfSightEnhanced(Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]) {
+void Screen::screenFindLineOfSightEnhanced(Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]) {
int x, y;
/*
@@ -1213,7 +1213,7 @@ void Screen::screenGemUpdate() {
// TODO: Move the code responsible for determining 'peer' visibility to a non SDL specific part of the code.
if (g_context->_location->_map->_type == Map::DUNGEON) {
//DO THE SPECIAL DUNGEON MAP TRAVERSAL
- Std::vector<Std::vector<int> > drawnTiles(layout->_viewport.width(), Std::vector<int>(layout->_viewport.height(), 0));
+ Common::Array<Common::Array<int> > drawnTiles(layout->_viewport.width(), Common::Array<int>(layout->_viewport.height(), 0));
Common::List<Common::Pair<int, int> > coordStack;
//Put the avatar's position on the stack
@@ -1245,7 +1245,7 @@ void Screen::screenGemUpdate() {
// DRAW THE ACTUAL TILE
bool focus;
- Std::vector<MapTile> tiles = screenViewportTile(layout->_viewport.width(),
+ Common::Array<MapTile> tiles = screenViewportTile(layout->_viewport.width(),
layout->_viewport.height(), x - center_x + avt_x, y - center_y + avt_y, focus);
tile = tiles.front();
@@ -1389,15 +1389,15 @@ void inline screenUnlock(){};
void inline screenWait(int numberOfAnimationFrames){};
#endif
-const Std::vector<Common::String> &screenGetFilterNames() {
+const Common::Array<Common::String> &screenGetFilterNames() {
return g_screen->_filterNames;
}
-const Std::vector<Common::String> &screenGetGemLayoutNames() {
+const Common::Array<Common::String> &screenGetGemLayoutNames() {
return g_screen->_gemLayoutNames;
}
-const Std::vector<Common::String> &screenGetLineOfSightStyles() {
+const Common::Array<Common::String> &screenGetLineOfSightStyles() {
return g_screen->_lineOfSightStyles;
}
diff --git a/engines/ultima/ultima4/gfx/screen.h b/engines/ultima/ultima4/gfx/screen.h
index 36a6dcb6674..2e4d59f46c4 100644
--- a/engines/ultima/ultima4/gfx/screen.h
+++ b/engines/ultima/ultima4/gfx/screen.h
@@ -105,7 +105,7 @@ private:
MouseCursorSurface *_mouseCursors[5];
int _currentMouseCursor;
- Std::vector<TileAnimSet *> _tileAnimSets;
+ Common::Array<TileAnimSet *> _tileAnimSets;
Layout *_gemLayout;
Common::HashMap<Common::String, int> _dungeonTileChars;
ImageInfo *_charSetInfo;
@@ -120,9 +120,9 @@ private:
uint32 _priorFrameTime;
public:
- Std::vector<Common::String> _gemLayoutNames;
- Std::vector<Common::String> _filterNames;
- Std::vector<Common::String> _lineOfSightStyles;
+ Common::Array<Common::String> _gemLayoutNames;
+ Common::Array<Common::String> _filterNames;
+ Common::Array<Common::String> _lineOfSightStyles;
int _currentCycle;
TileAnimSet *_tileAnims;
private:
@@ -148,13 +148,13 @@ private:
* Finds which tiles in the viewport are visible from the avatars
* location in the middle. (original DOS algorithm)
*/
- void screenFindLineOfSight(Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]);
+ void screenFindLineOfSight(Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]);
/**
* Finds which tiles in the viewport are visible from the avatars
* location in the middle. (original DOS algorithm)
*/
- void screenFindLineOfSightDOS(Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]);
+ void screenFindLineOfSightDOS(Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]);
/**
* Finds which tiles in the viewport are visible from the avatars
@@ -174,7 +174,7 @@ private:
* viewport width and height are odd values and that the player
* is always at the center of the screen.
*/
- void screenFindLineOfSightEnhanced(Std::vector<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]);
+ void screenFindLineOfSightEnhanced(Common::Array<MapTile> viewportTiles[VIEWPORT_W][VIEWPORT_H]);
/**
* Generates terms a and b for equation "ax + b = y" that defines the
@@ -194,7 +194,7 @@ private:
int screenPointInTriangle(int x, int y, int tx1, int ty1, int tx2, int ty2, int tx3, int ty3);
Layout *screenGetGemLayout(const Map *map);
public:
- Std::vector<Layout *> _layouts;
+ Common::Array<Layout *> _layouts;
Scaler _filterScaler;
public:
@@ -267,7 +267,7 @@ public:
void screenUpdateCursor();
void screenUpdateMoons();
void screenUpdateWind();
- Std::vector<MapTile> screenViewportTile(uint width, uint height, int x, int y, bool &focus);
+ Common::Array<MapTile> screenViewportTile(uint width, uint height, int x, int y, bool &focus);
void screenShowCursor();
void screenHideCursor();
@@ -298,9 +298,9 @@ public:
extern Screen *g_screen;
-extern const Std::vector<Common::String> &screenGetGemLayoutNames();
-extern const Std::vector<Common::String> &screenGetFilterNames();
-extern const Std::vector<Common::String> &screenGetLineOfSightStyles();
+extern const Common::Array<Common::String> &screenGetGemLayoutNames();
+extern const Common::Array<Common::String> &screenGetFilterNames();
+extern const Common::Array<Common::String> &screenGetLineOfSightStyles();
} // End of namespace Ultima4
} // End of namespace Ultima
diff --git a/engines/ultima/ultima4/map/city.h b/engines/ultima/ultima4/map/city.h
index 514aad985ce..2832787544e 100644
--- a/engines/ultima/ultima4/map/city.h
+++ b/engines/ultima/ultima4/map/city.h
@@ -36,7 +36,7 @@ struct PersonRole {
int _id;
};
-typedef Std::vector<Person *> PersonList;
+typedef Common::Array<Person *> PersonList;
typedef Common::List<PersonRole *> PersonRoleList;
class City : public Map {
@@ -77,7 +77,7 @@ public:
PersonList _persons;
Common::Path _tlkFname;
PersonRoleList _personRoles;
- Std::vector<Dialogue *> _extraDialogues;
+ Common::Array<Dialogue *> _extraDialogues;
};
/**
diff --git a/engines/ultima/ultima4/map/dungeon.h b/engines/ultima/ultima4/map/dungeon.h
index 656ad33b4d4..750a39851b5 100644
--- a/engines/ultima/ultima4/map/dungeon.h
+++ b/engines/ultima/ultima4/map/dungeon.h
@@ -172,7 +172,7 @@ public:
// Properties
Common::String _name;
uint _nRooms;
- Std::vector<byte> _dataSubTokens;
+ Common::Array<byte> _dataSubTokens;
DngRoom *_rooms;
CombatMap **_roomMaps;
int _currentRoom;
diff --git a/engines/ultima/ultima4/map/location.cpp b/engines/ultima/ultima4/map/location.cpp
index 332c12f6d26..783e99b1109 100644
--- a/engines/ultima/ultima4/map/location.cpp
+++ b/engines/ultima/ultima4/map/location.cpp
@@ -67,8 +67,8 @@ Location::Location(MapCoords coords, Map *map, int viewmode, LocationContext ctx
locationPush(prev, this);
}
-Std::vector<MapTile> Location::tilesAt(MapCoords coords, bool &focus) {
- Std::vector<MapTile> tiles;
+Common::Array<MapTile> Location::tilesAt(MapCoords coords, bool &focus) {
+ Common::Array<MapTile> tiles;
Common::List<Annotation *> a = _map->_annotations->ptrsToAllAt(coords);
Common::List<Annotation *>::iterator i;
Object *obj = _map->objectAt(coords);
diff --git a/engines/ultima/ultima4/map/location.h b/engines/ultima/ultima4/map/location.h
index 5695886a10e..d1109f378e1 100644
--- a/engines/ultima/ultima4/map/location.h
+++ b/engines/ultima/ultima4/map/location.h
@@ -56,7 +56,7 @@ public:
/**
* Return the entire stack of objects at the given location.
*/
- Std::vector<MapTile> tilesAt(MapCoords coords, bool &focus);
+ Common::Array<MapTile> tilesAt(MapCoords coords, bool &focus);
/**
* Finds a valid replacement tile for the given location, using surrounding tiles
diff --git a/engines/ultima/ultima4/map/map.h b/engines/ultima/ultima4/map/map.h
index bbafc47b351..3d41c9f5ee8 100644
--- a/engines/ultima/ultima4/map/map.h
+++ b/engines/ultima/ultima4/map/map.h
@@ -44,9 +44,9 @@ class Tileset;
struct Portal;
struct _Dungeon;
-typedef Std::vector<Portal *> PortalList;
+typedef Common::Array<Portal *> PortalList;
typedef Common::List<int> CompressedChunkList;
-typedef Std::vector<MapTile> MapData;
+typedef Common::Array<MapTile> MapData;
/* flags */
#define SHOW_AVATAR (1 << 0)
diff --git a/engines/ultima/ultima4/map/mapmgr.cpp b/engines/ultima/ultima4/map/mapmgr.cpp
index 6756adda1ea..52f3fd6308f 100644
--- a/engines/ultima/ultima4/map/mapmgr.cpp
+++ b/engines/ultima/ultima4/map/mapmgr.cpp
@@ -60,7 +60,7 @@ MapMgr::MapMgr() {
const Config *config = Config::getInstance();
Map *map;
- Std::vector<ConfigElement> maps = config->getElement("maps").getChildren();
+ Common::Array<ConfigElement> maps = config->getElement("maps").getChildren();
for (const auto &i : maps) {
map = initMapFromConf(i);
@@ -77,7 +77,7 @@ MapMgr::~MapMgr() {
void MapMgr::unloadMap(MapId id) {
delete _mapList[id];
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> maps = config->getElement("maps").getChildren();
+ Common::Array<ConfigElement> maps = config->getElement("maps").getChildren();
for (const auto &i : maps) {
if (id == static_cast<MapId>(i.getInt("id"))) {
@@ -187,7 +187,7 @@ Map *MapMgr::initMapFromConf(const ConfigElement &mapConf) {
map->_tileSet = g_tileSets->get(mapConf.getString("tileset"));
map->_tileMap = g_tileMaps->get(mapConf.getString("tilemap"));
- Std::vector<ConfigElement> children = mapConf.getChildren();
+ Common::Array<ConfigElement> children = mapConf.getChildren();
for (const auto &i : children) {
if (i.getName() == "city") {
City *city = dynamic_cast<City *>(map);
@@ -221,7 +221,7 @@ void MapMgr::initCityFromConf(const ConfigElement &cityConf, City *city) {
city->_type = cityConf.getString("type");
city->_tlkFname = cityConf.getString("tlk_fname");
- Std::vector<ConfigElement> children = cityConf.getChildren();
+ Common::Array<ConfigElement> children = cityConf.getChildren();
for (const auto &i : children) {
if (i.getName() == "personrole")
city->_personRoles.push_back(initPersonRoleFromConf(i));
@@ -309,7 +309,7 @@ Portal *MapMgr::initPortalFromConf(const ConfigElement &portalConf) {
// for new/fan maps being added to the overworld
portal->_tile = portalConf.exists("tile") ? portalConf.getInt("tile") : -1;
- Std::vector<ConfigElement> children = portalConf.getChildren();
+ Common::Array<ConfigElement> children = portalConf.getChildren();
for (const auto &i : children) {
if (i.getName() == "retroActiveDest") {
portal->_retroActiveDest = new PortalDestination();
diff --git a/engines/ultima/ultima4/map/mapmgr.h b/engines/ultima/ultima4/map/mapmgr.h
index 9052a20725f..c4e6b129a99 100644
--- a/engines/ultima/ultima4/map/mapmgr.h
+++ b/engines/ultima/ultima4/map/mapmgr.h
@@ -129,7 +129,7 @@ private:
int initCompressedChunkFromConf(const ConfigElement &compressedChunkConf);
static MapMgr *_instance;
- Std::vector<Map *> _mapList;
+ Common::Array<Map *> _mapList;
};
#define mapMgr (MapMgr::getInstance())
diff --git a/engines/ultima/ultima4/map/shrine.h b/engines/ultima/ultima4/map/shrine.h
index 5e776ffc500..313d4217794 100644
--- a/engines/ultima/ultima4/map/shrine.h
+++ b/engines/ultima/ultima4/map/shrine.h
@@ -64,7 +64,7 @@ private:
class Shrines {
public:
int _cycles, _completedCycles;
- Std::vector<Common::String> _advice;
+ Common::Array<Common::String> _advice;
public:
/**
* Constructor
diff --git a/engines/ultima/ultima4/map/tile.h b/engines/ultima/ultima4/map/tile.h
index b32f5425914..95ee8bbf8f5 100644
--- a/engines/ultima/ultima4/map/tile.h
+++ b/engines/ultima/ultima4/map/tile.h
@@ -235,7 +235,7 @@ private:
Image *_image; /**< The original image for this tile (with all of its frames) */
bool _tiledInDungeon;
- Std::vector<Direction> _directions;
+ Common::Array<Direction> _directions;
Common::String _animationRule;
diff --git a/engines/ultima/ultima4/map/tileanim.cpp b/engines/ultima/ultima4/map/tileanim.cpp
index 144fb142d66..21343ea77ef 100644
--- a/engines/ultima/ultima4/map/tileanim.cpp
+++ b/engines/ultima/ultima4/map/tileanim.cpp
@@ -48,7 +48,7 @@ TileAnimTransform *TileAnimTransform::create(const ConfigElement &conf) {
transform = new TileAnimPixelTransform(
conf.getInt("x"), conf.getInt("y"));
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "color") {
RGBA *rgba = loadColorFromConf(i);
@@ -71,8 +71,8 @@ TileAnimTransform *TileAnimTransform::create(const ConfigElement &conf) {
conf.getInt("x"), conf.getInt("y"),
conf.getInt("width"), conf.getInt("height"));
- Std::vector<ConfigElement> children = conf.getChildren();
- for (Std::vector<ConfigElement>::iterator i = children.begin(); i != children.end(); i++) {
+ Common::Array<ConfigElement> children = conf.getChildren();
+ for (Common::Array<ConfigElement>::iterator i = children.begin(); i != children.end(); i++) {
if (i->getName() == "color") {
RGBA *rgba = loadColorFromConf(*i);
if (i == children.begin())
@@ -238,7 +238,7 @@ TileAnimContext *TileAnimContext::create(const ConfigElement &conf) {
// Add the transforms to the context
if (context) {
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "transform") {
@@ -272,7 +272,7 @@ bool TileAnimPlayerDirContext::isInContext(Tile *t, MapTile &mapTile, Direction
TileAnimSet::TileAnimSet(const ConfigElement &conf) {
_name = conf.getString("name");
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "tileanim") {
TileAnim *anim = new TileAnim(i);
@@ -300,7 +300,7 @@ TileAnim::TileAnim(const ConfigElement &conf) : _random(0) {
if (conf.exists("random"))
_random = conf.getInt("random");
- Std::vector<ConfigElement> children = conf.getChildren();
+ Common::Array<ConfigElement> children = conf.getChildren();
for (const auto &i : children) {
if (i.getName() == "transform") {
TileAnimTransform *transform = TileAnimTransform::create(i);
@@ -322,8 +322,8 @@ TileAnim::~TileAnim() {
}
void TileAnim::draw(Image *dest, Tile *tile, MapTile &mapTile, Direction dir) {
- Std::vector<TileAnimTransform *>::const_iterator t;
- Std::vector<TileAnimContext *>::const_iterator c;
+ Common::Array<TileAnimTransform *>::const_iterator t;
+ Common::Array<TileAnimContext *>::const_iterator c;
bool drawn = false;
// Nothing to do, draw the tile and return!
diff --git a/engines/ultima/ultima4/map/tileanim.h b/engines/ultima/ultima4/map/tileanim.h
index 66140620c5c..6bc399caefd 100644
--- a/engines/ultima/ultima4/map/tileanim.h
+++ b/engines/ultima/ultima4/map/tileanim.h
@@ -78,7 +78,7 @@ public:
bool drawsTile() const override;
int x, y;
- Std::vector<RGBA *> _colors;
+ Common::Array<RGBA *> _colors;
};
/**
@@ -134,7 +134,7 @@ public:
*/
class TileAnimContext {
public:
- typedef Std::vector<TileAnimTransform *> TileAnimTransformList;
+ typedef Common::Array<TileAnimTransform *> TileAnimTransformList;
typedef enum {
FRAME,
DIR
@@ -200,8 +200,8 @@ public:
~TileAnim();
Common::String _name;
- Std::vector<TileAnimTransform *> _transforms;
- Std::vector<TileAnimContext *> _contexts;
+ Common::Array<TileAnimTransform *> _transforms;
+ Common::Array<TileAnimContext *> _contexts;
/* returns the frame to set the mapTile to (only relevant if persistent) */
void draw(Image *dest, Tile *tile, MapTile &mapTile, Direction dir);
diff --git a/engines/ultima/ultima4/map/tilemap.cpp b/engines/ultima/ultima4/map/tilemap.cpp
index 426f20f9f43..bf15cd8e828 100644
--- a/engines/ultima/ultima4/map/tilemap.cpp
+++ b/engines/ultima/ultima4/map/tilemap.cpp
@@ -41,7 +41,7 @@ TileMaps::~TileMaps() {
void TileMaps::loadAll() {
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> conf;
+ Common::Array<ConfigElement> conf;
// FIXME: make sure tilesets are loaded by now
unloadAll();
@@ -76,7 +76,7 @@ void TileMaps::load(const ConfigElement &tilemapConf) {
Common::String tileset = tilemapConf.getString("tileset");
int index = 0;
- Std::vector<ConfigElement> children = tilemapConf.getChildren();
+ Common::Array<ConfigElement> children = tilemapConf.getChildren();
for (const auto &i : children) {
if (i.getName() != "mapping")
continue;
diff --git a/engines/ultima/ultima4/map/tileset.cpp b/engines/ultima/ultima4/map/tileset.cpp
index d5b1e5208e9..eea5964e2cb 100644
--- a/engines/ultima/ultima4/map/tileset.cpp
+++ b/engines/ultima/ultima4/map/tileset.cpp
@@ -46,7 +46,7 @@ TileRules::~TileRules() {
void TileRules::load() {
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> rules = config->getElement("tileRules").getChildren();
+ Common::Array<ConfigElement> rules = config->getElement("tileRules").getChildren();
for (const auto &i : rules) {
TileRule *rule = new TileRule();
@@ -79,7 +79,7 @@ TileSets::~TileSets() {
void TileSets::loadAll() {
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> conf;
+ Common::Array<ConfigElement> conf;
unloadAll();
@@ -257,7 +257,7 @@ void Tileset::load(const ConfigElement &tilesetConf) {
_extends = nullptr;
int index = 0;
- Std::vector<ConfigElement> children = tilesetConf.getChildren();
+ Common::Array<ConfigElement> children = tilesetConf.getChildren();
for (const auto &i : children) {
if (i.getName() != "tile")
continue;
diff --git a/engines/ultima/ultima4/sound/music.cpp b/engines/ultima/ultima4/sound/music.cpp
index 2c5c5a58635..cdd6605729e 100644
--- a/engines/ultima/ultima4/sound/music.cpp
+++ b/engines/ultima/ultima4/sound/music.cpp
@@ -61,7 +61,7 @@ Music::Music(Audio::Mixer *mixer) :
*/
const Config *config = Config::getInstance();
- Std::vector<ConfigElement> musicConfs = config->getElement("music").getChildren();
+ Common::Array<ConfigElement> musicConfs = config->getElement("music").getChildren();
for (const auto &m : musicConfs) {
if (m.getName() != "track")
continue;
diff --git a/engines/ultima/ultima4/sound/music.h b/engines/ultima/ultima4/sound/music.h
index 5df86cb1f43..c6fac81bcd9 100644
--- a/engines/ultima/ultima4/sound/music.h
+++ b/engines/ultima/ultima4/sound/music.h
@@ -57,7 +57,7 @@ public:
private:
Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle;
- Std::vector<Common::String> _filenames;
+ Common::Array<Common::String> _filenames;
/**
* Play a given music file if is exists
diff --git a/engines/ultima/ultima4/sound/sound.cpp b/engines/ultima/ultima4/sound/sound.cpp
index 48c485fb64b..9d231649a33 100644
--- a/engines/ultima/ultima4/sound/sound.cpp
+++ b/engines/ultima/ultima4/sound/sound.cpp
@@ -55,7 +55,7 @@ SoundManager::SoundManager(Audio::Mixer *mixer) : _mixer(mixer) {
_soundFilenames.reserve(SOUND_MAX);
_sounds.resize(SOUND_MAX);
- Std::vector<ConfigElement> soundConfs = config->getElement("sound").getChildren();
+ Common::Array<ConfigElement> soundConfs = config->getElement("sound").getChildren();
for (const auto &s : soundConfs) {
if (s.getName() != "track")
continue;
diff --git a/engines/ultima/ultima4/sound/sound.h b/engines/ultima/ultima4/sound/sound.h
index fdd28fb8fc7..75cc9b89873 100644
--- a/engines/ultima/ultima4/sound/sound.h
+++ b/engines/ultima/ultima4/sound/sound.h
@@ -73,8 +73,8 @@ class SoundManager {
private:
Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle;
- Std::vector<Common::Path> _soundFilenames;
- Std::vector<Audio::SeekableAudioStream *> _sounds;
+ Common::Array<Common::Path> _soundFilenames;
+ Common::Array<Audio::SeekableAudioStream *> _sounds;
private:
bool load(Sound sound);
diff --git a/engines/ultima/ultima4/ultima4.h b/engines/ultima/ultima4/ultima4.h
index 6a5b149663f..fe5fc036c5f 100644
--- a/engines/ultima/ultima4/ultima4.h
+++ b/engines/ultima/ultima4/ultima4.h
@@ -93,7 +93,7 @@ public:
TileRules *_tileRules;
TileSets *_tileSets;
Weapons *_weapons;
- Std::vector<Common::String> _hawkwindText;
+ Common::Array<Common::String> _hawkwindText;
public:
Ultima4Engine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
~Ultima4Engine() override;
diff --git a/engines/ultima/ultima4/views/dungeonview.cpp b/engines/ultima/ultima4/views/dungeonview.cpp
index 1654de08f66..c0277093be5 100644
--- a/engines/ultima/ultima4/views/dungeonview.cpp
+++ b/engines/ultima/ultima4/views/dungeonview.cpp
@@ -53,7 +53,7 @@ void DungeonView::display(Context *c, TileView *view) {
// Note: This shouldn't go above 4, unless we check opaque tiles each step of the way.
const int farthest_non_wall_tile_visibility = 4;
- Std::vector<MapTile> tiles;
+ Common::Array<MapTile> tiles;
g_screen->screenEraseMapArea();
if (c->_party->getTorchDuration() > 0) {
@@ -76,7 +76,7 @@ void DungeonView::display(Context *c, TileView *view) {
// This only checks that the tile at y==3 is opaque
if (y == 3 && !tiles.front().getTileType()->isOpaque()) {
for (int y_obj = farthest_non_wall_tile_visibility; y_obj > y; y_obj--) {
- Std::vector<MapTile> distant_tiles = getTiles(y_obj , 0);
+ Common::Array<MapTile> distant_tiles = getTiles(y_obj , 0);
DungeonGraphicType distant_type = tilesToGraphic(distant_tiles);
if ((distant_type == DNGGRAPHIC_DNGTILE) || (distant_type == DNGGRAPHIC_BASETILE))
@@ -91,7 +91,7 @@ void DungeonView::display(Context *c, TileView *view) {
// 3rd-person perspective
else {
- Std::vector<MapTile> tiles;
+ Common::Array<MapTile> tiles;
static MapTile black = c->_location->_map->_tileSet->getByName("black")->getId();
static MapTile avatar = c->_location->_map->_tileSet->getByName("avatar")->getId();
@@ -228,7 +228,7 @@ void DungeonView::drawTile(Tile *tile, int x_offset, int distance, Direction ori
DungeonViewer.drawInDungeon(tile, x_offset, distance, orientation, tile->isTiledInDungeon());
}
-Std::vector<MapTile> DungeonView::getTiles(int fwd, int side) {
+Common::Array<MapTile> DungeonView::getTiles(int fwd, int side) {
MapCoords coords = g_context->_location->_coords;
switch (g_ultima->_saveGame->_orientation) {
@@ -265,7 +265,7 @@ Std::vector<MapTile> DungeonView::getTiles(int fwd, int side) {
return g_context->_location->tilesAt(coords, focus);
}
-DungeonGraphicType DungeonView::tilesToGraphic(const Std::vector<MapTile> &tiles) {
+DungeonGraphicType DungeonView::tilesToGraphic(const Common::Array<MapTile> &tiles) {
MapTile tile = tiles.front();
if (!_tiles._loaded) {
diff --git a/engines/ultima/ultima4/views/dungeonview.h b/engines/ultima/ultima4/views/dungeonview.h
index 60259321737..022ae8d52fd 100644
--- a/engines/ultima/ultima4/views/dungeonview.h
+++ b/engines/ultima/ultima4/views/dungeonview.h
@@ -45,8 +45,8 @@ typedef enum {
DNGGRAPHIC_BASETILE
} DungeonGraphicType;
-Std::vector<MapTile> dungeonViewGetTiles(int fwd, int side);
-DungeonGraphicType dungeonViewTilesToGraphic(const Std::vector<MapTile> &tiles);
+Common::Array<MapTile> dungeonViewGetTiles(int fwd, int side);
+DungeonGraphicType dungeonViewTilesToGraphic(const Common::Array<MapTile> &tiles);
#define DungeonViewer (*DungeonView::getInstance())
@@ -82,13 +82,13 @@ public:
void drawWall(int xoffset, int distance, Direction orientation, DungeonGraphicType type);
void display(Context *c, TileView *view);
- DungeonGraphicType tilesToGraphic(const Std::vector<MapTile> &tiles);
+ DungeonGraphicType tilesToGraphic(const Common::Array<MapTile> &tiles);
bool toggle3DDungeonView() {
return _screen3dDungeonViewEnabled = !_screen3dDungeonViewEnabled;
}
- Std::vector<MapTile> getTiles(int fwd, int side);
+ Common::Array<MapTile> getTiles(int fwd, int side);
};
} // End of namespace Ultima4
diff --git a/engines/ultima/ultima4/views/menuitem.cpp b/engines/ultima/ultima4/views/menuitem.cpp
index 7ae65fe9acb..c733ca314c9 100644
--- a/engines/ultima/ultima4/views/menuitem.cpp
+++ b/engines/ultima/ultima4/views/menuitem.cpp
@@ -132,7 +132,7 @@ void BoolMenuItem::activate(MenuEvent &event) {
}
StringMenuItem::StringMenuItem(const Common::String &text, short xp, short yp, int shortcutKey,
- Common::String *val, const Std::vector<Common::String> &validSettings) :
+ Common::String *val, const Common::Array<Common::String> &validSettings) :
MenuItem(text, xp, yp, shortcutKey),
_val(val),
_validSettings(validSettings) {
@@ -145,7 +145,7 @@ Common::String StringMenuItem::getText() const {
}
void StringMenuItem::activate(MenuEvent &event) {
- Std::vector<Common::String>::const_iterator current =
+ Common::Array<Common::String>::const_iterator current =
find(_validSettings.begin(), _validSettings.end(), *_val);
if (current == _validSettings.end())
diff --git a/engines/ultima/ultima4/views/menuitem.h b/engines/ultima/ultima4/views/menuitem.h
index 9239439a0a7..423e0e14c46 100644
--- a/engines/ultima/ultima4/views/menuitem.h
+++ b/engines/ultima/ultima4/views/menuitem.h
@@ -113,14 +113,14 @@ protected:
*/
class StringMenuItem : public MenuItem {
public:
- StringMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, Common::String *val, const Std::vector<Common::String> &validSettings);
+ StringMenuItem(const Common::String &text, short xp, short yp, int shortcutKey, Common::String *val, const Common::Array<Common::String> &validSettings);
void activate(MenuEvent &event) override;
Common::String getText() const override;
protected:
Common::String *_val;
- Std::vector<Common::String> _validSettings;
+ Common::Array<Common::String> _validSettings;
};
/**
diff --git a/engines/ultima/ultima4/views/tileview.cpp b/engines/ultima/ultima4/views/tileview.cpp
index 7f9ee6e55c5..2b60fc64327 100644
--- a/engines/ultima/ultima4/views/tileview.cpp
+++ b/engines/ultima/ultima4/views/tileview.cpp
@@ -121,7 +121,7 @@ void TileView::drawTile(MapTile &mapTile, bool focus, int x, int y) {
drawFocus(x, y);
}
-void TileView::drawTile(Std::vector<MapTile> &tiles, bool focus, int x, int y) {
+void TileView::drawTile(Common::Array<MapTile> &tiles, bool focus, int x, int y) {
assertMsg(x < _columns, "x value of %d out of range", x);
assertMsg(y < _rows, "y value of %d out of range", y);
diff --git a/engines/ultima/ultima4/views/tileview.h b/engines/ultima/ultima4/views/tileview.h
index 305bb9767d3..827524f3d4e 100644
--- a/engines/ultima/ultima4/views/tileview.h
+++ b/engines/ultima/ultima4/views/tileview.h
@@ -47,7 +47,7 @@ public:
void reinit();
void drawTile(MapTile &mapTile, bool focus, int x, int y);
- void drawTile(Std::vector<MapTile> &tiles, bool focus, int x, int y);
+ void drawTile(Common::Array<MapTile> &tiles, bool focus, int x, int y);
/**
* Draw a focus rectangle around the tile
diff --git a/engines/ultima/ultima8/audio/sound_flex.h b/engines/ultima/ultima8/audio/sound_flex.h
index f4ed8c1b315..812ef8cf11b 100644
--- a/engines/ultima/ultima8/audio/sound_flex.h
+++ b/engines/ultima/ultima8/audio/sound_flex.h
@@ -53,7 +53,7 @@ public:
private:
AudioSample **_samples;
- Std::vector<SoundFlexEntry> _index;
+ Common::Array<SoundFlexEntry> _index;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/audio/speech_flex.h b/engines/ultima/ultima8/audio/speech_flex.h
index 8e35544474b..b30a7a42cf5 100644
--- a/engines/ultima/ultima8/audio/speech_flex.h
+++ b/engines/ultima/ultima8/audio/speech_flex.h
@@ -29,7 +29,7 @@ namespace Ultima {
namespace Ultima8 {
class SpeechFlex : public SoundFlex {
- Std::vector<Common::String> _phrases;
+ Common::Array<Common::String> _phrases;
public:
SpeechFlex(Common::SeekableReadStream *rs);
diff --git a/engines/ultima/ultima8/conf/config_file_manager.cpp b/engines/ultima/ultima8/conf/config_file_manager.cpp
index 6f4159fa21d..c56216fa7eb 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.cpp
+++ b/engines/ultima/ultima8/conf/config_file_manager.cpp
@@ -70,7 +70,7 @@ void ConfigFileManager::clear() {
}
void ConfigFileManager::clearRoot(const Common::String &category) {
- Std::vector<ConfigFile *>::iterator i = _configFiles.begin();
+ Common::Array<ConfigFile *>::iterator i = _configFiles.begin();
while (i != _configFiles.end()) {
if (category.equalsIgnoreCase((*i)->_category)) {
@@ -114,8 +114,8 @@ bool ConfigFileManager::get(const Common::String &category, const Common::String
return true;
}
-Std::vector<Common::String> ConfigFileManager::listSections(const Common::String &category) const {
- Std::vector<Common::String> sections;
+Common::Array<Common::String> ConfigFileManager::listSections(const Common::String &category) const {
+ Common::Array<Common::String> sections;
for (const auto *i : _configFiles) {
if (category.equalsIgnoreCase(i->_category)) {
Common::INIFile::SectionList sectionList = i->_iniFile.getSections();
diff --git a/engines/ultima/ultima8/conf/config_file_manager.h b/engines/ultima/ultima8/conf/config_file_manager.h
index 6af7e2d9fab..eee7b7d79c4 100644
--- a/engines/ultima/ultima8/conf/config_file_manager.h
+++ b/engines/ultima/ultima8/conf/config_file_manager.h
@@ -68,7 +68,7 @@ public:
//! list all sections
//! \param category The config category to list all sections in
//! \return the sections. They have no guaranteed order.
- Std::vector<Common::String> listSections(const Common::String &category) const;
+ Common::Array<Common::String> listSections(const Common::String &category) const;
//! list all key-value pairs in the given section.
//! \param category The config category for the section to list
//! \param section The section to list
@@ -76,7 +76,7 @@ public:
KeyMap listKeyValues(const Common::String &category, const Common::String §ion) const;
private:
- Std::vector<ConfigFile *> _configFiles;
+ Common::Array<ConfigFile *> _configFiles;
static ConfigFileManager *_configFileManager;
};
diff --git a/engines/ultima/ultima8/filesys/archive.h b/engines/ultima/ultima8/filesys/archive.h
index e286bb7f057..2af67287529 100644
--- a/engines/ultima/ultima8/filesys/archive.h
+++ b/engines/ultima/ultima8/filesys/archive.h
@@ -83,7 +83,7 @@ protected:
uint32 getRawSize(uint32 index) const;
private:
- Std::vector<FlexFile *> _sources;
+ Common::Array<FlexFile *> _sources;
FlexFile *findArchiveFile(uint32 index) const;
};
diff --git a/engines/ultima/ultima8/filesys/raw_archive.h b/engines/ultima/ultima8/filesys/raw_archive.h
index 8078ac496a9..a2e584f4ba8 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.h
+++ b/engines/ultima/ultima8/filesys/raw_archive.h
@@ -55,7 +55,7 @@ public:
virtual Common::SeekableReadStream *get_datasource(uint32 index);
protected:
- Std::vector<uint8 *> _objects;
+ Common::Array<uint8 *> _objects;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/games/game_data.cpp b/engines/ultima/ultima8/games/game_data.cpp
index 709cd0e383c..2b782c7f441 100644
--- a/engines/ultima/ultima8/games/game_data.cpp
+++ b/engines/ultima/ultima8/games/game_data.cpp
@@ -375,7 +375,7 @@ void GameData::setupJPOverrides() {
int fontnum = atoi(i._key.c_str());
const Common::String &fontdesc = i._value;
- Std::vector<Common::String> vals;
+ Common::Array<Common::String> vals;
SplitString(fontdesc, ',', vals);
if (vals.size() != 2) {
warning("Invalid jpfont override: %s", fontdesc.c_str());
@@ -406,7 +406,7 @@ void GameData::setupTTFOverrides(const char *category, bool SJIS) {
int fontnum = atoi(i._key.c_str());
const Common::String &fontdesc = i._value;
- Std::vector<Common::String> vals;
+ Common::Array<Common::String> vals;
SplitString(fontdesc, ',', vals);
if (vals.size() != 4) {
warning("Invalid ttf override: %s", fontdesc.c_str());
diff --git a/engines/ultima/ultima8/games/game_data.h b/engines/ultima/ultima8/games/game_data.h
index e5affa22c96..9cb0d10bc6c 100644
--- a/engines/ultima/ultima8/games/game_data.h
+++ b/engines/ultima/ultima8/games/game_data.h
@@ -120,18 +120,18 @@ private:
RawArchive *_fixed;
MainShapeArchive *_mainShapes;
Usecode *_mainUsecode;
- Std::vector<MapGlob *> _globs;
+ Common::Array<MapGlob *> _globs;
FontShapeArchive *_fonts;
GumpShapeArchive *_gumps;
Shape *_mouse;
MusicFlex *_music;
WpnOvlayDat *_weaponOverlay;
- Std::vector<NPCDat *> _npcTable;
- Std::vector<CombatDat *> _combatData;
- Std::vector<WeaselDat *> _weaselData;
+ Common::Array<NPCDat *> _npcTable;
+ Common::Array<CombatDat *> _combatData;
+ Common::Array<WeaselDat *> _weaselData;
SoundFlex *_soundFlex;
- Std::vector<SpeechFlex **> _speech;
+ Common::Array<SpeechFlex **> _speech;
GameInfo *_gameInfo;
static GameData *_gameData;
diff --git a/engines/ultima/ultima8/games/game_info.cpp b/engines/ultima/ultima8/games/game_info.cpp
index ce2cbb36ee0..a4d07ed4fdc 100644
--- a/engines/ultima/ultima8/games/game_info.cpp
+++ b/engines/ultima/ultima8/games/game_info.cpp
@@ -181,7 +181,7 @@ void GameInfo::save(Common::WriteStream *ws) {
bool GameInfo::load(Common::SeekableReadStream *rs, uint32 ver) {
Common::String s;
- Std::vector<Common::String> parts;
+ Common::Array<Common::String> parts;
s = rs->readLine();
SplitString(s, ',', parts);
diff --git a/engines/ultima/ultima8/games/treasure_loader.cpp b/engines/ultima/ultima8/games/treasure_loader.cpp
index c516bec9c46..d9cd7c338b4 100644
--- a/engines/ultima/ultima8/games/treasure_loader.cpp
+++ b/engines/ultima/ultima8/games/treasure_loader.cpp
@@ -52,10 +52,10 @@ void TreasureLoader::loadDefaults() {
}
bool TreasureLoader::parse(const Common::String &desc,
- Std::vector<TreasureInfo> &treasure) const {
+ Common::Array<TreasureInfo> &treasure) const {
treasure.clear();
- Std::vector<Common::String> tr;
+ Common::Array<Common::String> tr;
SplitString(desc, ';', tr);
TreasureInfo ti;
@@ -75,7 +75,7 @@ bool TreasureLoader::internalParse(const Common::String &desc, TreasureInfo &ti,
ti.clear();
bool loadedDefault = false;
- Std::vector<Common::Pair<Common::String, Common::String> > kv;
+ Common::Array<Common::Pair<Common::String, Common::String> > kv;
SplitStringKV(desc, ' ', kv);
for (unsigned int i = 0; i < kv.size(); ++i) {
@@ -163,7 +163,7 @@ bool TreasureLoader::internalParse(const Common::String &desc, TreasureInfo &ti,
}
bool TreasureLoader::parseUInt32Vector(const Common::String &val_,
- Std::vector<uint32> &vec) const {
+ Common::Array<uint32> &vec) const {
Common::String val = val_;
vec.clear();
diff --git a/engines/ultima/ultima8/games/treasure_loader.h b/engines/ultima/ultima8/games/treasure_loader.h
index c26f085e4fb..356414667c1 100644
--- a/engines/ultima/ultima8/games/treasure_loader.h
+++ b/engines/ultima/ultima8/games/treasure_loader.h
@@ -39,14 +39,14 @@ public:
void loadDefaults();
//! parse treasure string into vector of TreasureInfo objects
- bool parse(const Common::String &, Std::vector<TreasureInfo> &treasure) const;
+ bool parse(const Common::String &, Common::Array<TreasureInfo> &treasure) const;
private:
TreasureMap _defaultTreasure;
bool internalParse(const Common::String &desc, TreasureInfo &ti, bool loadingDefault) const;
- bool parseUInt32Vector(const Common::String &val, Std::vector<uint32> &vec) const;
+ bool parseUInt32Vector(const Common::String &val, Common::Array<uint32> &vec) const;
bool parseUIntRange(const Common::String &val, unsigned int &min, unsigned int &max) const;
bool parseDouble(const Common::String &val, double &d) const;
bool parseInt(const Common::String &val, int &i) const;
diff --git a/engines/ultima/ultima8/gfx/anim_dat.h b/engines/ultima/ultima8/gfx/anim_dat.h
index 02bd14e7bc3..50dc7395810 100644
--- a/engines/ultima/ultima8/gfx/anim_dat.h
+++ b/engines/ultima/ultima8/gfx/anim_dat.h
@@ -45,7 +45,7 @@ public:
//! Return the action number for a given animation sequence on the given actor
static uint32 getActionNumberForSequence(Animation::Sequence action, const Actor *actor);
private:
- Std::vector<ActorAnim *> _anims;
+ Common::Array<ActorAnim *> _anims;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gfx/fonts/font_manager.h b/engines/ultima/ultima8/gfx/fonts/font_manager.h
index b521ae8cff9..d1555a45298 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_manager.h
+++ b/engines/ultima/ultima8/gfx/fonts/font_manager.h
@@ -73,9 +73,9 @@ private:
//! Override fontnum with specified font
void setOverride(unsigned int fontnum, Font *newFont);
- Std::vector<Font *> _overrides;
+ Common::Array<Font *> _overrides;
- Std::vector<Font *> _ttFonts;
+ Common::Array<Font *> _ttFonts;
static FontManager *_fontManager;
public:
diff --git a/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
index 9899e926fa9..87ef31e5765 100644
--- a/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
+++ b/engines/ultima/ultima8/gfx/fonts/font_shape_archive.cpp
@@ -68,7 +68,7 @@ void FontShapeArchive::setHVLeads() {
int fontnum = atoi(i._key.c_str());
Common::String leaddesc = i._value;
- Std::vector<Common::String> vals;
+ Common::Array<Common::String> vals;
SplitString(leaddesc, ',', vals);
if (vals.size() != 2) {
warning("Invalid hlead/vlead description: %s", leaddesc.c_str());
diff --git a/engines/ultima/ultima8/gfx/gump_shape_archive.h b/engines/ultima/ultima8/gfx/gump_shape_archive.h
index bf784d14cc1..72eee092d17 100644
--- a/engines/ultima/ultima8/gfx/gump_shape_archive.h
+++ b/engines/ultima/ultima8/gfx/gump_shape_archive.h
@@ -43,7 +43,7 @@ public:
Common::Rect32 *getGumpItemArea(uint32 shapenum);
protected:
- Std::vector<Common::Rect32 *> _gumpItemArea;
+ Common::Array<Common::Rect32 *> _gumpItemArea;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gfx/palette_manager.h b/engines/ultima/ultima8/gfx/palette_manager.h
index 45df46c3307..870925c34ea 100644
--- a/engines/ultima/ultima8/gfx/palette_manager.h
+++ b/engines/ultima/ultima8/gfx/palette_manager.h
@@ -91,7 +91,7 @@ public:
void saveTransforms(Common::WriteStream &ws);
private:
- Std::vector<Palette *> _palettes;
+ Common::Array<Palette *> _palettes;
Graphics::PixelFormat _format;
static PaletteManager *_paletteManager;
diff --git a/engines/ultima/ultima8/gfx/shape_archive.h b/engines/ultima/ultima8/gfx/shape_archive.h
index 77eca18e7c6..c593ce8e9f4 100644
--- a/engines/ultima/ultima8/gfx/shape_archive.h
+++ b/engines/ultima/ultima8/gfx/shape_archive.h
@@ -52,7 +52,7 @@ protected:
uint16 _id;
const ConvertShapeFormat *_format;
const Palette *_palette;
- Std::vector<Shape *> _shapes;
+ Common::Array<Shape *> _shapes;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gfx/skf_player.h b/engines/ultima/ultima8/gfx/skf_player.h
index be9cbace9b6..cd6b06743b8 100644
--- a/engines/ultima/ultima8/gfx/skf_player.h
+++ b/engines/ultima/ultima8/gfx/skf_player.h
@@ -55,7 +55,7 @@ private:
int _width, _height;
RawArchive *_skf;
- Std::vector<SKFEvent *> _events;
+ Common::Array<SKFEvent *> _events;
unsigned int _curFrame, _curObject;
unsigned int _curAction;
unsigned int _curEvent;
diff --git a/engines/ultima/ultima8/gfx/type_flags.cpp b/engines/ultima/ultima8/gfx/type_flags.cpp
index 69a5c22316d..b8002cb148d 100644
--- a/engines/ultima/ultima8/gfx/type_flags.cpp
+++ b/engines/ultima/ultima8/gfx/type_flags.cpp
@@ -181,7 +181,7 @@ void TypeFlags::loadWeaponInfo() {
ConfigFileManager *config = ConfigFileManager::get_instance();
// load weapons
- Std::vector<Common::String> weaponkeys;
+ Common::Array<Common::String> weaponkeys;
Common::String category = "weapons";
weaponkeys = config->listSections(category);
for (const auto §ion : weaponkeys) {
@@ -301,7 +301,7 @@ void TypeFlags::loadArmourInfo() {
MainShapeArchive *msf = GameData::get_instance()->getMainShapes();
// load armour
- Std::vector<Common::String> armourkeys;
+ Common::Array<Common::String> armourkeys;
Common::String category = "armour";
armourkeys = config->listSections(category);
for (const auto §ion : armourkeys) {
@@ -357,7 +357,7 @@ void TypeFlags::loadMonsterInfo() {
treasureLoader.loadDefaults();
// load monsters
- Std::vector<Common::String> monsterkeys;
+ Common::Array<Common::String> monsterkeys;
Common::String category = "monsters";
monsterkeys = config->listSections(category);
for (const auto §ion : monsterkeys) {
diff --git a/engines/ultima/ultima8/gfx/type_flags.h b/engines/ultima/ultima8/gfx/type_flags.h
index a24ac8c50bd..05a1aebec8a 100644
--- a/engines/ultima/ultima8/gfx/type_flags.h
+++ b/engines/ultima/ultima8/gfx/type_flags.h
@@ -42,7 +42,7 @@ private:
void loadArmourInfo();
void loadMonsterInfo();
- Std::vector<ShapeInfo> _shapeInfo;
+ Common::Array<ShapeInfo> _shapeInfo;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
index e04a4b3ce56..9b5da76703e 100644
--- a/engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
+++ b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.cpp
@@ -81,7 +81,7 @@ void WpnOvlayDat::load(RawArchive *overlaydat) {
for (unsigned int type = 0; type < typecount; type++) {
awo->_overlay[type]._dirCount = dircount;
awo->_overlay[type]._frames =
- new Std::vector<WeaponOverlayFrame>[dircount];
+ new Common::Array<WeaponOverlayFrame>[dircount];
for (unsigned int dir = 0; dir < dircount; dir++) {
awo->_overlay[type]._frames[dir].resize(animlength);
for (unsigned int frame = 0; frame < animlength; frame++) {
diff --git a/engines/ultima/ultima8/gfx/wpn_ovlay_dat.h b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
index 5a146edc54b..9d7df6974ab 100644
--- a/engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
+++ b/engines/ultima/ultima8/gfx/wpn_ovlay_dat.h
@@ -44,7 +44,7 @@ public:
Direction direction, int frame) const;
private:
- Std::vector<AnimWeaponOverlay *> _overlay;
+ Common::Array<AnimWeaponOverlay *> _overlay;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/keypad_gump.cpp b/engines/ultima/ultima8/gumps/keypad_gump.cpp
index b9f6dd760d8..a727759b408 100644
--- a/engines/ultima/ultima8/gumps/keypad_gump.cpp
+++ b/engines/ultima/ultima8/gumps/keypad_gump.cpp
@@ -194,7 +194,7 @@ void KeypadGump::updateDigitDisplay() {
txt->InitGump(this);
txt->SetIndex(TXT_CONTAINER_IDX);
- Std::vector<Gump *> digits;
+ Common::Array<Gump *> digits;
Shape *digitshape = GameData::get_instance()->getGumps()->getShape(12);
int val = _value;
while (val) {
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index c9e9328ff93..40cb8d0e13c 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -39,7 +39,7 @@ MessageBoxGump::MessageBoxGump()
}
MessageBoxGump::MessageBoxGump(const Common::String &title, const Common::String &message, uint32 titleColour,
- Std::vector<Common::String> *buttons) :
+ Common::Array<Common::String> *buttons) :
ModalGump(0, 0, 100, 100), _title(title), _message(message), _titleColour(titleColour) {
if (buttons)
buttons->swap(_buttons);
@@ -146,7 +146,7 @@ void MessageBoxGump::ChildNotify(Gump *child, uint32 msg) {
}
}
-ProcId MessageBoxGump::Show(Common::String _title, Common::String _message, uint32 titleColour, Std::vector<Common::String> *_buttons) {
+ProcId MessageBoxGump::Show(Common::String _title, Common::String _message, uint32 titleColour, Common::Array<Common::String> *_buttons) {
Gump *gump = new MessageBoxGump(_title, _message, titleColour, _buttons);
gump->InitGump(0);
gump->setRelativePosition(CENTER);
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index 6fbad0a7675..f94aae16a50 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -40,13 +40,13 @@ namespace Ultima8 {
class MessageBoxGump : public ModalGump {
Common::String _title;
Common::String _message;
- Std::vector<Common::String> _buttons;
+ Common::Array<Common::String> _buttons;
int _titleColour;
public:
ENABLE_RUNTIME_CLASSTYPE()
MessageBoxGump();
- MessageBoxGump(const Common::String &title, const Common::String &message, uint32 title_colour, Std::vector<Common::String> *buttons);
+ MessageBoxGump(const Common::String &title, const Common::String &message, uint32 title_colour, Common::Array<Common::String> *buttons);
~MessageBoxGump() override;
// Init the gump, call after construction
@@ -64,8 +64,8 @@ public:
//! \param titleColour The colour to be displayed behind the title bar
//! \param buttons Array of button names to be displayed. Default is "Ok"
//! \return Pid of process that will have the result when finished
- static ProcId Show(Common::String title, Common::String message, uint32 titleColour, Std::vector<Common::String> *buttons = 0);
- static ProcId Show(Common::String title, Common::String message, Std::vector<Common::String> *buttons) {
+ static ProcId Show(Common::String title, Common::String message, uint32 titleColour, Common::Array<Common::String> *buttons = 0);
+ static ProcId Show(Common::String title, Common::String message, Common::Array<Common::String> *buttons) {
return Show(title, message, TEX32_PACK_RGB(0x30, 0x30, 0x8F), buttons);
}
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.h b/engines/ultima/ultima8/gumps/u8_save_gump.h
index e2ad6856d46..7be98a913b6 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.h
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.h
@@ -57,8 +57,8 @@ protected:
bool _save;
int _page;
- Std::vector<EditWidget *> _editWidgets;
- Std::vector<Common::String> _descriptions;
+ Common::Array<EditWidget *> _editWidgets;
+ Common::Array<Common::String> _descriptions;
void loadDescriptions();
diff --git a/engines/ultima/ultima8/gumps/weasel_dat.h b/engines/ultima/ultima8/gumps/weasel_dat.h
index 4a6b8557ca7..fd72ab0fcc5 100644
--- a/engines/ultima/ultima8/gumps/weasel_dat.h
+++ b/engines/ultima/ultima8/gumps/weasel_dat.h
@@ -58,12 +58,12 @@ public:
uint16 getNumOfType(WeaselType type) const;
- const Std::vector<WeaselEntry> &getItems() const {
+ const Common::Array<WeaselEntry> &getItems() const {
return _items;
}
private:
- Std::vector<WeaselEntry> _items;
+ Common::Array<WeaselEntry> _items;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.cpp b/engines/ultima/ultima8/gumps/weasel_gump.cpp
index 5b83de249bb..c243a3e204b 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.cpp
+++ b/engines/ultima/ultima8/gumps/weasel_gump.cpp
@@ -480,7 +480,7 @@ int WeaselGump::purchasedCount(uint16 shape) const {
}
void WeaselGump::updateItemDisplay() {
- const Std::vector<WeaselDat::WeaselEntry> &items = _weaselDat->getItems();
+ const Common::Array<WeaselDat::WeaselEntry> &items = _weaselDat->getItems();
// should always have the item..
assert(_curItem < (int)items.size());
diff --git a/engines/ultima/ultima8/gumps/weasel_gump.h b/engines/ultima/ultima8/gumps/weasel_gump.h
index 2338093ba60..3a020eb821e 100644
--- a/engines/ultima/ultima8/gumps/weasel_gump.h
+++ b/engines/ultima/ultima8/gumps/weasel_gump.h
@@ -109,7 +109,7 @@ private:
int32 _credits;
/// The list of pending purchases (shape nums)
- Std::vector<uint16> _purchases;
+ Common::Array<uint16> _purchases;
/// The current item num being browsed
int _curItem;
diff --git a/engines/ultima/ultima8/kernel/object_manager.h b/engines/ultima/ultima8/kernel/object_manager.h
index d73646a04b7..6b4ee97b9e2 100644
--- a/engines/ultima/ultima8/kernel/object_manager.h
+++ b/engines/ultima/ultima8/kernel/object_manager.h
@@ -69,7 +69,7 @@ public:
void saveObject(Common::WriteStream *ws, Object *obj) const;
Object *loadObject(Common::ReadStream *rs, uint32 version);
- Std::vector<Object *> _objects;
+ Common::Array<Object *> _objects;
idMan *_objIDs;
idMan *_actorIDs;
diff --git a/engines/ultima/ultima8/kernel/process.cpp b/engines/ultima/ultima8/kernel/process.cpp
index 96d1999fffa..accfea3c7ed 100644
--- a/engines/ultima/ultima8/kernel/process.cpp
+++ b/engines/ultima/ultima8/kernel/process.cpp
@@ -118,7 +118,7 @@ Common::String Process::dumpInfo() const {
if (!_waiting.empty()) {
info += ", notify: ";
- for (Std::vector<ProcId>::const_iterator i = _waiting.begin(); i != _waiting.end(); ++i) {
+ for (Common::Array<ProcId>::const_iterator i = _waiting.begin(); i != _waiting.end(); ++i) {
if (i != _waiting.begin()) info += ", ";
info += Common::String::format("%d", *i);
}
diff --git a/engines/ultima/ultima8/kernel/process.h b/engines/ultima/ultima8/kernel/process.h
index 6b6ecaedb83..2ed659202bf 100644
--- a/engines/ultima/ultima8/kernel/process.h
+++ b/engines/ultima/ultima8/kernel/process.h
@@ -143,7 +143,7 @@ protected:
//! Processes waiting for this one to finish.
//! When this process terminates, awaken them and pass them the result val.
- Std::vector<ProcId> _waiting;
+ Common::Array<ProcId> _waiting;
public:
diff --git a/engines/ultima/ultima8/misc/id_man.h b/engines/ultima/ultima8/misc/id_man.h
index 0d8af999a9b..081f50e93c8 100644
--- a/engines/ultima/ultima8/misc/id_man.h
+++ b/engines/ultima/ultima8/misc/id_man.h
@@ -48,7 +48,7 @@ class idMan {
uint16 _usedCount; //!< number of IDs currently in use
- Std::vector<uint16> _ids; //!< the 'next' field in a list of free IDs
+ Common::Array<uint16> _ids; //!< the 'next' field in a list of free IDs
uint16 _first; //!< the first ID in the free list
uint16 _last; //!< the last ID in the last list
public:
diff --git a/engines/ultima/ultima8/misc/util.cpp b/engines/ultima/ultima8/misc/util.cpp
index e162a3ac293..5f19aea4131 100644
--- a/engines/ultima/ultima8/misc/util.cpp
+++ b/engines/ultima/ultima8/misc/util.cpp
@@ -89,7 +89,7 @@ template<class T> void StringToArgv(const T &args, Common::Array<T> &argv) {
template void StringToArgv<Common::String>(const Common::String &args, Common::Array<Common::String> &argv);
template<class T> void SplitString(const T &args, char sep,
- Std::vector<T> &argv) {
+ Common::Array<T> &argv) {
// Clear the vector
argv.clear();
@@ -110,16 +110,16 @@ template<class T> void SplitString(const T &args, char sep,
}
-template void SplitString<Common::String>(const Common::String &args, char sep, Std::vector<Common::String> &argv);
+template void SplitString<Common::String>(const Common::String &args, char sep, Common::Array<Common::String> &argv);
template<class T> void SplitStringKV(const T &args, char sep,
- Std::vector<Common::Pair<T, T> > &argv) {
+ Common::Array<Common::Pair<T, T> > &argv) {
// Clear the vector
argv.clear();
if (args.empty()) return;
- Std::vector<T> keyvals;
+ Common::Array<T> keyvals;
SplitString(args, sep, keyvals);
for (unsigned int i = 0; i < keyvals.size(); ++i) {
@@ -139,7 +139,7 @@ template<class T> void SplitStringKV(const T &args, char sep,
}
}
-template void SplitStringKV<Common::String>(const Common::String &args, char sep, Std::vector<Common::Pair<Common::String, Common::String> > &argv);
+template void SplitStringKV<Common::String>(const Common::String &args, char sep, Common::Array<Common::Pair<Common::String, Common::String> > &argv);
} // End of namespace Ultima8
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/misc/util.h b/engines/ultima/ultima8/misc/util.h
index 268f49d8ced..4db20697423 100644
--- a/engines/ultima/ultima8/misc/util.h
+++ b/engines/ultima/ultima8/misc/util.h
@@ -29,10 +29,10 @@ namespace Ultima8 {
template<class T> void StringToArgv(const T &args, Common::Array<T> &argv);
-template<class T> void SplitString(const T &args, char sep, Std::vector<T> &argv);
+template<class T> void SplitString(const T &args, char sep, Common::Array<T> &argv);
template<class T> void SplitStringKV(const T &args, char sep,
- Std::vector<Common::Pair<T, T> > &argv);
+ Common::Array<Common::Pair<T, T> > &argv);
} // End of namespace Ultima8
} // End of namespace Ultima
diff --git a/engines/ultima/ultima8/usecode/uc_list.h b/engines/ultima/ultima8/usecode/uc_list.h
index 9a4cd02ea7a..e159d6c0f28 100644
--- a/engines/ultima/ultima8/usecode/uc_list.h
+++ b/engines/ultima/ultima8/usecode/uc_list.h
@@ -39,7 +39,7 @@ namespace Ultima8 {
// Question: does subtractList remove _all_ occurrences of elements or only 1?
class UCList {
- Std::vector<uint8> _elements;
+ Common::Array<uint8> _elements;
unsigned int _elementSize;
unsigned int _size;
diff --git a/engines/ultima/ultima8/world/actors/actor.cpp b/engines/ultima/ultima8/world/actors/actor.cpp
index e64c97f8395..ff4bf8cad31 100644
--- a/engines/ultima/ultima8/world/actors/actor.cpp
+++ b/engines/ultima/ultima8/world/actors/actor.cpp
@@ -168,7 +168,7 @@ bool Actor::giveTreasure() {
return false;
Common::RandomSource &rs = Ultima8Engine::get_instance()->getRandomSource();
- const Std::vector<TreasureInfo> &treasure = mi->_treasure;
+ const Common::Array<TreasureInfo> &treasure = mi->_treasure;
for (unsigned int i = 0; i < treasure.size(); ++i) {
const TreasureInfo &ti = treasure[i];
diff --git a/engines/ultima/ultima8/world/actors/actor_anim.h b/engines/ultima/ultima8/world/actors/actor_anim.h
index bd71c4149b9..151d3540644 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim.h
@@ -44,7 +44,7 @@ public:
}
private:
- Std::vector<AnimAction *> _actions; // list of this actor's actions
+ Common::Array<AnimAction *> _actions; // list of this actor's actions
// (0 if actor doesn't have action)
};
diff --git a/engines/ultima/ultima8/world/actors/anim_action.h b/engines/ultima/ultima8/world/actors/anim_action.h
index 86278dbb4dc..48ccd366a40 100644
--- a/engines/ultima/ultima8/world/actors/anim_action.h
+++ b/engines/ultima/ultima8/world/actors/anim_action.h
@@ -174,7 +174,7 @@ private:
uint32 _shapeNum;
uint32 _action;
- Std::vector<AnimFrame> _frames[16]; // 8 or 16 directions
+ Common::Array<AnimFrame> _frames[16]; // 8 or 16 directions
unsigned int _size;
int _frameRepeat;
AnimActionFlags _flags;
diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index 5e6720fae48..e190c55473c 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -702,7 +702,7 @@ void MainActor::addKeycard(int bitno) {
_keycards |= (1 << bitno);
}
-static uint16 getIdOfNextItemInList(const Std::vector<Item *> &items, uint16 current) {
+static uint16 getIdOfNextItemInList(const Common::Array<Item *> &items, uint16 current) {
const int n = items.size();
if (n == 0)
return 0;
@@ -720,7 +720,7 @@ static uint16 getIdOfNextItemInList(const Std::vector<Item *> &items, uint16 cur
}
void MainActor::nextWeapon() {
- Std::vector<Item *> weapons;
+ Common::Array<Item *> weapons;
getItemsWithShapeFamily(weapons, ShapeInfo::SF_CRUWEAPON, true);
_activeWeapon = getIdOfNextItemInList(weapons, _activeWeapon);
@@ -747,7 +747,7 @@ void MainActor::dropWeapon() {
}
void MainActor::nextInvItem() {
- Std::vector<Item *> items;
+ Common::Array<Item *> items;
getItemsWithShapeFamily(items, ShapeInfo::SF_CRUINVITEM, true);
getItemsWithShapeFamily(items, ShapeInfo::SF_CRUBOMB, true);
if (GAME_IS_REMORSE) {
diff --git a/engines/ultima/ultima8/world/actors/monster_info.h b/engines/ultima/ultima8/world/actors/monster_info.h
index 8719ff2c93e..63a1f5b98b2 100644
--- a/engines/ultima/ultima8/world/actors/monster_info.h
+++ b/engines/ultima/ultima8/world/actors/monster_info.h
@@ -42,7 +42,7 @@ struct MonsterInfo {
bool _shifter; // shapeshifter
uint32 _explode; // shape to hurl around after being killed (or 0)
- Std::vector<TreasureInfo> _treasure;
+ Common::Array<TreasureInfo> _treasure;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/npc_dat.cpp b/engines/ultima/ultima8/world/actors/npc_dat.cpp
index b071a09c760..f1b4668a065 100644
--- a/engines/ultima/ultima8/world/actors/npc_dat.cpp
+++ b/engines/ultima/ultima8/world/actors/npc_dat.cpp
@@ -56,8 +56,8 @@ NPCDat::NPCDat(Common::SeekableReadStream &rs, Common::SeekableReadStream &namer
}
/*static*/
-Std::vector<NPCDat *> NPCDat::load(RawArchive *archive) {
- Std::vector<NPCDat *> result;
+Common::Array<NPCDat *> NPCDat::load(RawArchive *archive) {
+ Common::Array<NPCDat *> result;
assert(archive);
if (archive->getCount() < 2) {
warning("NPCDat: Archive does not include the expected objects.");
diff --git a/engines/ultima/ultima8/world/actors/npc_dat.h b/engines/ultima/ultima8/world/actors/npc_dat.h
index 974d107d318..ac73f0a2382 100644
--- a/engines/ultima/ultima8/world/actors/npc_dat.h
+++ b/engines/ultima/ultima8/world/actors/npc_dat.h
@@ -32,7 +32,7 @@ class NPCDat {
public:
NPCDat();
- static Std::vector<NPCDat *> load(RawArchive *archive);
+ static Common::Array<NPCDat *> load(RawArchive *archive);
const Common::String &getName() const {
return _name;
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.cpp b/engines/ultima/ultima8/world/actors/pathfinder.cpp
index fb255479878..c8c73ead82b 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder.cpp
@@ -165,7 +165,7 @@ void Pathfinder::setTarget(Item *item, bool hit) {
}
bool Pathfinder::canReach() {
- Std::vector<PathfindingAction> path;
+ Common::Array<PathfindingAction> path;
return pathfind(path);
}
@@ -491,7 +491,7 @@ void Pathfinder::expandNode(PathNode *node) {
}
}
-bool Pathfinder::pathfind(Std::vector<PathfindingAction> &path) {
+bool Pathfinder::pathfind(Common::Array<PathfindingAction> &path) {
if (_targetItem) {
debugC(kDebugPath, "Actor %u pathfinding to item %u", _actor->getObjId(), _targetItem->getObjId());
debugC(kDebugPath, "Target Item: %s", _targetItem->dumpInfo().c_str());
diff --git a/engines/ultima/ultima8/world/actors/pathfinder.h b/engines/ultima/ultima8/world/actors/pathfinder.h
index 4675fe3dd95..604a5d29322 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder.h
@@ -79,7 +79,7 @@ public:
bool canReach();
//! pathfind. If true, the found path is returned in path
- bool pathfind(Std::vector<PathfindingAction> &path);
+ bool pathfind(Common::Array<PathfindingAction> &path);
#ifdef DEBUG_PATHFINDER
static ObjId _visualDebugActor;
@@ -97,10 +97,10 @@ protected:
int32 _actorXd, _actorYd, _actorZd;
Common::Array<PathfindingState> _visited;
- PriorityQueue<PathNode *, Std::vector<PathNode *>, PathNodeCmp> _nodes;
+ PriorityQueue<PathNode *, Common::Array<PathNode *>, PathNodeCmp> _nodes;
/** List of nodes for garbage collection later and order is not important */
- Std::vector<PathNode *> _cleanupNodes;
+ Common::Array<PathNode *> _cleanupNodes;
bool alreadyVisited(const Point3 &pt) const;
void newNode(PathNode *oldnode, PathfindingState &state,
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.h b/engines/ultima/ultima8/world/actors/pathfinder_process.h
index 2c0ac35f7df..0369897950a 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.h
@@ -52,7 +52,7 @@ protected:
ObjId _targetItem;
bool _hitMode;
- Std::vector<PathfindingAction> _path;
+ Common::Array<PathfindingAction> _path;
unsigned int _currentStep;
public:
diff --git a/engines/ultima/ultima8/world/actors/treasure_info.h b/engines/ultima/ultima8/world/actors/treasure_info.h
index d4a1a7bb632..23627bc952e 100644
--- a/engines/ultima/ultima8/world/actors/treasure_info.h
+++ b/engines/ultima/ultima8/world/actors/treasure_info.h
@@ -32,8 +32,8 @@ struct TreasureInfo {
Common::String _special;
double _chance;
int _map;
- Std::vector<uint32> _shapes;
- Std::vector<uint32> _frames;
+ Common::Array<uint32> _shapes;
+ Common::Array<uint32> _frames;
unsigned int _minCount, _maxCount;
TreasureInfo() : _chance(1), _map(0), _minCount(1), _maxCount(1) {}
diff --git a/engines/ultima/ultima8/world/actors/weapon_overlay.h b/engines/ultima/ultima8/world/actors/weapon_overlay.h
index 1e403b435b6..a768eab1e3f 100644
--- a/engines/ultima/ultima8/world/actors/weapon_overlay.h
+++ b/engines/ultima/ultima8/world/actors/weapon_overlay.h
@@ -35,7 +35,7 @@ struct WeaponOverlayFrame {
struct WeaponOverlay {
unsigned int _dirCount;
- Std::vector<WeaponOverlayFrame> *_frames; // 8 or 16 directions
+ Common::Array<WeaponOverlayFrame> *_frames; // 8 or 16 directions
WeaponOverlay() : _frames(nullptr), _dirCount(0) {
}
@@ -71,7 +71,7 @@ struct AnimWeaponOverlay {
return &(_overlay[type]._frames[diroff][frame]);
}
- Std::vector<WeaponOverlay> _overlay;
+ Common::Array<WeaponOverlay> _overlay;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/container.cpp b/engines/ultima/ultima8/world/container.cpp
index a75ce16f196..97d272f90ea 100644
--- a/engines/ultima/ultima8/world/container.cpp
+++ b/engines/ultima/ultima8/world/container.cpp
@@ -298,7 +298,7 @@ Item *Container::getFirstItemWithShape(uint16 shapeno, bool recurse) {
return nullptr;
}
-void Container::getItemsWithShapeFamily(Std::vector<Item *> &itemlist, uint16 family, bool recurse) {
+void Container::getItemsWithShapeFamily(Common::Array<Item *> &itemlist, uint16 family, bool recurse) {
for (auto *item : _contents) {
if (item->getShapeInfo()->_family == family)
itemlist.push_back(item);
diff --git a/engines/ultima/ultima8/world/container.h b/engines/ultima/ultima8/world/container.h
index 2018f9ccffd..e38c059f415 100644
--- a/engines/ultima/ultima8/world/container.h
+++ b/engines/ultima/ultima8/world/container.h
@@ -92,7 +92,7 @@ public:
//! A simpler search of the container which just gets the
//! items with a given shape family, optionally recursively.
//! \return The first item with that shape, or nullptr if nothing found.
- void getItemsWithShapeFamily(Std::vector<Item *> &itemlist, uint16 family, bool recurse);
+ void getItemsWithShapeFamily(Common::Array<Item *> &itemlist, uint16 family, bool recurse);
//! Get the weight of the container and its contents
//! \return weight
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.h b/engines/ultima/ultima8/world/egg_hatcher_process.h
index 1b2bed064fa..cec160c3c17 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.h
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.h
@@ -46,7 +46,7 @@ public:
void saveData(Common::WriteStream *ws) override;
private:
- Std::vector<uint16> _eggs;
+ Common::Array<uint16> _eggs;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/item_selection_process.cpp b/engines/ultima/ultima8/world/item_selection_process.cpp
index 9bf8bac4883..17df27d8408 100644
--- a/engines/ultima/ultima8/world/item_selection_process.cpp
+++ b/engines/ultima/ultima8/world/item_selection_process.cpp
@@ -73,7 +73,7 @@ bool ItemSelectionProcess::selectNextItem(bool grab) {
currentmap->areaSearch(&uclist, script, sizeof(script),
mainactor, 0x200, false);
- Std::vector<Item *> candidates;
+ Common::Array<Item *> candidates;
for (unsigned int i = 0; i < uclist.getSize(); ++i) {
ObjId itemid = uclist.getuint16(i);
diff --git a/engines/ultima/ultima8/world/map_glob.h b/engines/ultima/ultima8/world/map_glob.h
index 6327c4b6c16..15cf741535b 100644
--- a/engines/ultima/ultima8/world/map_glob.h
+++ b/engines/ultima/ultima8/world/map_glob.h
@@ -45,7 +45,7 @@ public:
void read(Common::SeekableReadStream *rs);
private:
- Std::vector<GlobItem> _contents;
+ Common::Array<GlobItem> _contents;
};
} // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/world.h b/engines/ultima/ultima8/world/world.h
index 9034f61dc40..39a823bf22e 100644
--- a/engines/ultima/ultima8/world/world.h
+++ b/engines/ultima/ultima8/world/world.h
@@ -177,7 +177,7 @@ private:
static World *_world;
- Std::vector<Map *> _maps;
+ Common::Array<Map *> _maps;
CurrentMap *_currentMap;
Common::List<ObjId> _ethereal;
More information about the Scummvm-git-logs
mailing list