/*
Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
Person::players[1]->num_weapons = 1;
Person::players[1]->weaponids[0] = 0;
- if (Person::players[0]->weaponactive != -1) {
+ if (Person::players[0]->hasWeapon()) {
weapons[Person::players[0]->weaponids[Person::players[0]->weaponactive]].setType(staff);
} else {
weapons[0].setType(staff);
}
break;
case 41:
- if (Person::players[0]->weaponactive == -1 && Person::players[0]->num_weapons > 0) {
+ if (!Person::players[0]->hasWeapon() && Person::players[0]->num_weapons > 0) {
success = 1;
}
break;
string = "You can move the mouse to rotate the camera.";
break;
case 4:
- string = std::string("Try using the ") +
- Input::keyToChar(Game::forwardkey) + ", " +
- Input::keyToChar(Game::leftkey) + ", " +
- Input::keyToChar(Game::backkey) + " and " +
- Input::keyToChar(Game::rightkey) + " keys to move around.";
+ string = std::string("Try using the ") + Input::keyToChar(Game::forwardkey);
+ string += std::string(", ") + Input::keyToChar(Game::leftkey);
+ string += std::string(", ") + Input::keyToChar(Game::backkey);
+ string += std::string(" and ") + Input::keyToChar(Game::rightkey) + " keys to move around.";
string2 = "All movement is relative to the camera.";
break;
case 5: