libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA1: Fix gcc warnings

Browse Source
This commit is contained in:
dreammaster 2020-01-22 02:52:08 +00:00 committed by Paul Gilbert
parent 7b81f2a137
commit 260b8aaca5
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/ultima/shared/gfx/text_input.cpp
View File

@ -62,7 +62,7 @@ void TextInput::draw() {
bool TextInput::KeypressMsg(CKeypressMsg &msg) {
uint16 c = msg._keyState.ascii;
TreeItem *respondTo = _respondTo;
//TreeItem *respondTo = _respondTo;
if (c >= ' ' && c <= 0x7f) {
// Printable character

4
engines/ultima/ultima1/maps/map_city_castle.cpp
View File

@ -244,14 +244,14 @@ void MapCityCastle::attack(int direction, int effectId, uint maxDistance, uint a
Point delta = getDirectionDelta();
U1MapTile tile;
Widgets::Person *person;
int currTile;
//int currTile;
// Scan in the given direction for a person to attack
uint distance = 1;
do {
Point pt = getPosition() + Point(delta.x * distance, delta.y * distance);
getTileAt(pt, &tile);
currTile = tile._tileId == CTILE_63 ? -1 : tile._tileId;
//currTile = tile._tileId == CTILE_63 ? -1 : tile._tileId;
person = dynamic_cast<Widgets::Person *>(tile._widget);
} while (++distance <= maxDistance && !person && (tile._tileId == CTILE_GROUND || tile._tileId >= CTILE_POND_EDGE1));

2
engines/ultima/ultima1/maps/map_dungeon.cpp
View File

@ -332,7 +332,7 @@ void MapDungeon::attack(int direction, int effectId) {
}
void MapDungeon::attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) {
const Character &c = *static_cast<Party *>(_game->_party);
//const Character &c = *static_cast<Party *>(_game->_party);
Widgets::DungeonMonster *monster = findCreatureInCurrentDirection(maxDistance);
_game->playFX(effectId);

4
engines/ultima/ultima1/spells/kill_magic_missile.cpp
View File

@ -53,8 +53,8 @@ bool KillMagicMIssile::CharacterInputMsg(CCharacterInputMsg &msg) {
} else {
addInfoMsg(_game->_res->DIRECTION_NAMES[(int)dir - 1]);
addInfoMsg(_game->_res->SPELL_PHRASES[_spellId == SPELL_MAGIC_MISSILE ? 12 : 13], false);
uint damage = _spellId == SPELL_MAGIC_MISSILE ?
c.equippedWeapon()->getMagicDamage() : 9999;
//uint damage = _spellId == SPELL_MAGIC_MISSILE ?
// c.equippedWeapon()->getMagicDamage() : 9999;
if (c._class == CLASS_CLERIC || _game->getRandomNumber(1, 100) < c._wisdom) {
_game->playFX(5);

6
engines/ultima/ultima1/widgets/overworld_monster.cpp
View File

@ -68,10 +68,10 @@ void OverworldMonster::attackParty() {
Point diff = playerPos - _position;
Point delta(SGN(diff.x), SGN(diff.y));
Point tempDiff;
int maxDistance = attackDistance();
//int maxDistance = attackDistance();
Shared::Maps::MapTile mapTile;
Shared::Character &c = *_game->_party;
uint threshold, damage;
//Shared::Character &c = *_game->_party;
//uint threshold, damage;
// Print out the monster attacking