Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove warnings, update readme. #980

Merged
merged 3 commits into from Sep 17, 2012
Merged

remove warnings, update readme. #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9042fed
Remove warnings from clang.
stefanbeller Sep 17, 2012
db6c669
Readme: update dependencies on debian based systems.
stefanbeller Sep 17, 2012
085774c
Ignore the desktop file created by cmake.
stefanbeller Sep 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -7,3 +7,4 @@ cmake_install.cmake
build/
# ignore also vim swap files
.*.sw*
flare.desktop
6 changes: 3 additions & 3 deletions README
View file
Open in desktop
Expand Up @@ -36,12 +36,12 @@ For easy building I recommend using cmake and make.

---

Installing dependencies on Ubuntu:
sudo apt-get install libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev
Installing dependencies on debian based systems (debian, Ubuntu, Kubuntu, etc):
sudo apt-get install libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev cmake make g++ git

There is also a flare build in the Ubuntu (universe)
http://packages.ubuntu.com/source/precise/flare

Installing dependencies on Arch Linux:
pacman -S --asdeps sdl sdl_image sdl_mixer libogg libvorbis hicolor-icon-theme python sdl_ttf

Expand Down
6 changes: 3 additions & 3 deletions src/GameStateLoad.cpp
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ GameStateLoad::GameStateLoad() : GameState() {
loaded = false;

label_loading = new WidgetLabel();

for (int i = 0; i < GAME_SLOT_MAX; i++) {
label_name[i] = new WidgetLabel();
label_level[i] = new WidgetLabel();
Expand All @@ -68,7 +68,7 @@ GameStateLoad::GameStateLoad() : GameState() {
button_alternate->label = msg->get("Delete Save");
button_alternate->enabled = false;

// Read positions from config file
// Read positions from config file
FileParser infile;

if (infile.open(mods->locate("menus/gameload.txt"))) {
Expand Down Expand Up @@ -307,7 +307,7 @@ void GameStateLoad::loadPreview(int slot) {

for (unsigned int i=0; i<equipped[slot].size(); i++) {
if ((unsigned)equipped[slot][i] > items->items.size()-1){
fprintf(stderr, "Item with id=%d out of bounds 1-%d. Your savegame is broken or you might use incompatible savegame/mod\nQuitting to avoid savegame rewriting\n", equipped[slot][i], items->items.size()-1);
fprintf(stderr, "Item with id=%d out of bounds 1-%zu. Your savegame is broken or you might use incompatible savegame/mod\nQuitting to avoid savegame rewriting\n", equipped[slot][i], items->items.size()-1);
SDL_Quit();
exit(1);
}
Expand Down
4 changes: 2 additions & 2 deletions src/ItemManager.cpp
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ void ItemManager::load(const string& filename) {
continue;
}
if (id_line) continue;

if (infile.key == "name")
items[id].name = msg->get(infile.val);
else if (infile.key == "level")
Expand Down Expand Up @@ -623,7 +623,7 @@ TooltipData ItemManager::getTooltip(int item, StatBlock *stats, bool vendor_view
bonus_counter = 0;
modifier = "";

tip.lines[tip.num_lines++];
tip.lines[tip.num_lines++] = "";
tip.colors[tip.num_lines] = set.color;
tip.lines[tip.num_lines++] = msg->get("Set: ") + msg->get(item_sets[items[item].set].name);

Expand Down