More cleanup.
This commit is contained in:
parent
f6f14227a1
commit
063020df22
4
Makefile
4
Makefile
|
@ -1,9 +1,9 @@
|
||||||
CXXFLAGS ?= -O2 -Wall -g
|
CXXFLAGS ?= -O2 -Wall -g
|
||||||
CXXFLAGS += `pkg-config --cflags sdl2 SDL2_image SDL2_mixer`
|
CXXFLAGS += `pkg-config --cflags sdl2 SDL2_image SDL2_mixer`
|
||||||
LIBS = `pkg-config --libs sdl2 SDL2_image SDL2_mixer`
|
LIBS = `pkg-config --libs sdl2 SDL2_image SDL2_mixer`
|
||||||
OBJS = alien.o audio.o bullet.o cargo.o collectable.o colors.o cutscene.o engine.o event.o explosion.o game.o gfx.o intermission.o loadSave.o messages.o misc.o missions.o player.o renderer.o resources.o screen.o ship.o shop.o Starfighter.o title.o weapons.o window.o
|
OBJS = alien.o audio.o bullet.o cargo.o collectable.o colors.o cutscene.o engine.o event.o explosion.o game.o gfx.o intermission.o messages.o misc.o missions.o player.o renderer.o resources.o save.o screen.o ship.o shop.o Starfighter.o title.o weapons.o window.o
|
||||||
|
|
||||||
VERSION = 1.6
|
VERSION = 1.7-dev
|
||||||
PROG = starfighter
|
PROG = starfighter
|
||||||
DOCS = docs/*
|
DOCS = docs/*
|
||||||
DATA = data gfx sound music
|
DATA = data gfx sound music
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
Project: Starfighter
|
Project: Starfighter
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
#include "gfx.h"
|
#include "gfx.h"
|
||||||
#include "intermission.h"
|
#include "intermission.h"
|
||||||
#include "loadSave.h"
|
#include "save.h"
|
||||||
#include "messages.h"
|
#include "messages.h"
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "missions.h"
|
#include "missions.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2014, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2014, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -2384,7 +2384,7 @@ int game_mainLoop()
|
||||||
if (game.area < MISN_VENUS)
|
if (game.area < MISN_VENUS)
|
||||||
{
|
{
|
||||||
updateSystemStatus();
|
updateSystemStatus();
|
||||||
saveGame(0);
|
save(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
rtn = 1;
|
rtn = 1;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -1110,7 +1110,7 @@ int intermission()
|
||||||
renderer_update();
|
renderer_update();
|
||||||
screen_clear(black);
|
screen_clear(black);
|
||||||
|
|
||||||
initSaveSlots();
|
save_initSlots();
|
||||||
|
|
||||||
loadBackground(systemBackground[game.system]);
|
loadBackground(systemBackground[game.system]);
|
||||||
|
|
||||||
|
@ -1179,7 +1179,7 @@ int intermission()
|
||||||
SDL_Surface *optionsSurface = gfx_createSurface(320, 240);
|
SDL_Surface *optionsSurface = gfx_createSurface(320, 240);
|
||||||
SDL_Surface *commsSurface = gfx_createSurface(450, 400);
|
SDL_Surface *commsSurface = gfx_createSurface(450, 400);
|
||||||
|
|
||||||
createSavesSurface(savesSurface, -1);
|
save_createSurface(savesSurface, -1);
|
||||||
intermission_createOptions(optionsSurface);
|
intermission_createOptions(optionsSurface);
|
||||||
intermission_createCommsSurface(commsSurface);
|
intermission_createCommsSurface(commsSurface);
|
||||||
|
|
||||||
|
@ -1369,7 +1369,7 @@ int intermission()
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
screen_blit(savesSurface, 200, 100);
|
screen_blit(savesSurface, 200, 100);
|
||||||
saveSlot = showSaveSlots(savesSurface, saveSlot);
|
saveSlot = save_showSlots(savesSurface, saveSlot);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4:
|
case 4:
|
||||||
|
@ -1415,7 +1415,7 @@ int intermission()
|
||||||
intermission_updateCommsSurface(commsSurface);
|
intermission_updateCommsSurface(commsSurface);
|
||||||
section = 1;
|
section = 1;
|
||||||
redrawBackground = true;
|
redrawBackground = true;
|
||||||
saveGame(0);
|
save(0);
|
||||||
}
|
}
|
||||||
else if (interceptionChance > 0)
|
else if (interceptionChance > 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -28,7 +28,7 @@ data. It returns the slot number (1 - 10) of the most recently
|
||||||
used file. On the title screen, this is used to determine whether
|
used file. On the title screen, this is used to determine whether
|
||||||
a player can "Continue Current Game" and "Load Saved Game".
|
a player can "Continue Current Game" and "Load Saved Game".
|
||||||
*/
|
*/
|
||||||
int initSaveSlots()
|
int save_initSlots()
|
||||||
{
|
{
|
||||||
char fileName[PATH_MAX];
|
char fileName[PATH_MAX];
|
||||||
int system;
|
int system;
|
||||||
|
@ -140,7 +140,7 @@ int initSaveSlots()
|
||||||
/*
|
/*
|
||||||
Fill in later...
|
Fill in later...
|
||||||
*/
|
*/
|
||||||
bool loadGame(int slot)
|
int save_load(int slot)
|
||||||
{
|
{
|
||||||
char filename[PATH_MAX];
|
char filename[PATH_MAX];
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
@ -155,7 +155,7 @@ bool loadGame(int slot)
|
||||||
{
|
{
|
||||||
printf("Error: Could not determine the version of the save file.\n");
|
printf("Error: Could not determine the version of the save file.\n");
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return false;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (game.saveFormat)
|
switch (game.saveFormat)
|
||||||
|
@ -209,7 +209,7 @@ bool loadGame(int slot)
|
||||||
default:
|
default:
|
||||||
printf("Error: Save format version not recognized.\n");
|
printf("Error: Save format version not recognized.\n");
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return false;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -220,13 +220,13 @@ bool loadGame(int slot)
|
||||||
fp = fopen(filename, "rb");
|
fp = fopen(filename, "rb");
|
||||||
|
|
||||||
if (fp == NULL)
|
if (fp == NULL)
|
||||||
return false;
|
return 0;
|
||||||
|
|
||||||
if (fread(&game, sizeof(Game), 1, fp) != 1)
|
if (fread(&game, sizeof(Game), 1, fp) != 1)
|
||||||
{
|
{
|
||||||
printf("Save game error. The file was not of the expected format.\n");
|
printf("Save game error. The file was not of the expected format.\n");
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return false;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
@ -248,10 +248,10 @@ bool loadGame(int slot)
|
||||||
for (int i = 0 ; i < 10 ; i++)
|
for (int i = 0 ; i < 10 ; i++)
|
||||||
systemPlanet[i].missionCompleted = game.missionCompleted[i];
|
systemPlanet[i].missionCompleted = game.missionCompleted[i];
|
||||||
|
|
||||||
return true;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void saveGame(int slot)
|
void save(int slot)
|
||||||
{
|
{
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
char fileName[PATH_MAX];
|
char fileName[PATH_MAX];
|
||||||
|
@ -342,11 +342,11 @@ void saveGame(int slot)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Recall to update the save slots... (lazy, yes)
|
// Recall to update the save slots... (lazy, yes)
|
||||||
initSaveSlots();
|
save_initSlots();
|
||||||
engine.keyState[KEY_FIRE] = 0;
|
engine.keyState[KEY_FIRE] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void createSavesSurface(SDL_Surface *savesSurface, int clickedSlot)
|
void save_createSurface(SDL_Surface *savesSurface, int clickedSlot)
|
||||||
{
|
{
|
||||||
int y = 10;
|
int y = 10;
|
||||||
|
|
||||||
|
@ -407,7 +407,7 @@ Displays the save slot available. For use with an interface that
|
||||||
has the cursor enabled. It returns the index number of the slot clicked
|
has the cursor enabled. It returns the index number of the slot clicked
|
||||||
so that the function invoking it can perform a load or save on that slot.
|
so that the function invoking it can perform a load or save on that slot.
|
||||||
*/
|
*/
|
||||||
int showSaveSlots(SDL_Surface *savesSurface, int saveSlot)
|
int save_showSlots(SDL_Surface *savesSurface, int saveSlot)
|
||||||
{
|
{
|
||||||
int clickedSlot = -1;
|
int clickedSlot = -1;
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ int showSaveSlots(SDL_Surface *savesSurface, int saveSlot)
|
||||||
r.x, r.y, r.w, r.h))
|
r.x, r.y, r.w, r.h))
|
||||||
{
|
{
|
||||||
clickedSlot = i;
|
clickedSlot = i;
|
||||||
createSavesSurface(savesSurface, i);
|
save_createSurface(savesSurface, i);
|
||||||
}
|
}
|
||||||
r.y += 30;
|
r.y += 30;
|
||||||
}
|
}
|
||||||
|
@ -433,13 +433,13 @@ int showSaveSlots(SDL_Surface *savesSurface, int saveSlot)
|
||||||
if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, 215,
|
if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, 215,
|
||||||
365, 100, 25))
|
365, 100, 25))
|
||||||
{
|
{
|
||||||
saveGame(saveSlot);
|
save(saveSlot);
|
||||||
createSavesSurface(savesSurface, -10);
|
save_createSurface(savesSurface, -10);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, 335,
|
if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, 335,
|
||||||
365, 100, 25))
|
365, 100, 25))
|
||||||
createSavesSurface(savesSurface, -1);
|
save_createSurface(savesSurface, -1);
|
||||||
|
|
||||||
if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, 453,
|
if (game_collision(engine.cursor_x + 13, engine.cursor_y + 13, 6, 6, 453,
|
||||||
365, 100, 25))
|
365, 100, 25))
|
||||||
|
@ -448,8 +448,8 @@ int showSaveSlots(SDL_Surface *savesSurface, int saveSlot)
|
||||||
sprintf(filename, "%ssave%.2d.dat", engine.configDirectory,
|
sprintf(filename, "%ssave%.2d.dat", engine.configDirectory,
|
||||||
saveSlot);
|
saveSlot);
|
||||||
remove(filename);
|
remove(filename);
|
||||||
initSaveSlots();
|
save_initSlots();
|
||||||
createSavesSurface(savesSurface, -11);
|
save_createSurface(savesSurface, -11);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -17,13 +17,13 @@ You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LOADSAVE_H
|
#ifndef SAVE_H
|
||||||
#define LOADSAVE_H
|
#define SAVE_H
|
||||||
|
|
||||||
extern int initSaveSlots();
|
int save_initSlots();
|
||||||
extern bool loadGame(int slot);
|
int save_load(int slot);
|
||||||
extern void saveGame(int slot);
|
void save(int slot);
|
||||||
extern void createSavesSurface(SDL_Surface *savesSurface, int clickedSlot);
|
void save_createSurface(SDL_Surface *savesSurface, int clickedSlot);
|
||||||
extern int showSaveSlots(SDL_Surface *savesSurface, int saveSlot);
|
int save_showSlots(SDL_Surface *savesSurface, int saveSlot);
|
||||||
|
|
||||||
#endif
|
#endif
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012 Guus Sliepen
|
Copyright (C) 2011, 2012 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -784,7 +784,7 @@ static void buy(int i)
|
||||||
|
|
||||||
if (!engine.cheatCash)
|
if (!engine.cheatCash)
|
||||||
game.cash -= shopItems[i].price;
|
game.cash -= shopItems[i].price;
|
||||||
saveGame(0);
|
save(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sell(int i)
|
static void sell(int i)
|
||||||
|
@ -1007,7 +1007,7 @@ static void sell(int i)
|
||||||
else
|
else
|
||||||
game.cash += shopItems[i].price;
|
game.cash += shopItems[i].price;
|
||||||
|
|
||||||
saveGame(0);
|
save(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void showShop()
|
void showShop()
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2012, 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2012, 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
@ -227,7 +227,7 @@ int doTitle()
|
||||||
renderer_update();
|
renderer_update();
|
||||||
screen_clear(black);
|
screen_clear(black);
|
||||||
|
|
||||||
continueSaveSlot = initSaveSlots();
|
continueSaveSlot = save_initSlots();
|
||||||
|
|
||||||
loadBackground("gfx/spirit.jpg");
|
loadBackground("gfx/spirit.jpg");
|
||||||
|
|
||||||
|
@ -406,7 +406,7 @@ int doTitle()
|
||||||
5, screen->h - 60, FONT_WHITE, 0, gfx_background);
|
5, screen->h - 60, FONT_WHITE, 0, gfx_background);
|
||||||
gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012",
|
gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012",
|
||||||
5, screen->h - 40, FONT_WHITE, 0, gfx_background);
|
5, screen->h - 40, FONT_WHITE, 0, gfx_background);
|
||||||
gfx_renderString("Copyright 2015, 2016 onpon4",
|
gfx_renderString("Copyright 2015, 2016 Julie Marchant",
|
||||||
5, screen->h - 20, FONT_WHITE, 0, gfx_background);
|
5, screen->h - 20, FONT_WHITE, 0, gfx_background);
|
||||||
gfx_renderString(buildVersion, screen->w - 6 - strlen(buildVersion) * 9,
|
gfx_renderString(buildVersion, screen->w - 6 - strlen(buildVersion) * 9,
|
||||||
screen->h - 20, FONT_WHITE, 0, gfx_background);
|
screen->h - 20, FONT_WHITE, 0, gfx_background);
|
||||||
|
@ -433,7 +433,7 @@ int doTitle()
|
||||||
5, screen->h - 60, FONT_WHITE, 0, gfx_background);
|
5, screen->h - 60, FONT_WHITE, 0, gfx_background);
|
||||||
gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012",
|
gfx_renderString("Copyright Guus Sliepen, Astrid S. de Wijn and others 2012",
|
||||||
5, screen->h - 40, FONT_WHITE, 0, gfx_background);
|
5, screen->h - 40, FONT_WHITE, 0, gfx_background);
|
||||||
gfx_renderString("Copyright 2015, 2016 onpon4",
|
gfx_renderString("Copyright 2015, 2016 Julie Marchant",
|
||||||
5, screen->h - 20, FONT_WHITE, 0, gfx_background);
|
5, screen->h - 20, FONT_WHITE, 0, gfx_background);
|
||||||
gfx_renderString(buildVersion, screen->w - 6 - strlen(buildVersion) * 9,
|
gfx_renderString(buildVersion, screen->w - 6 - strlen(buildVersion) * 9,
|
||||||
screen->h - 20, FONT_WHITE, 0, gfx_background);
|
screen->h - 20, FONT_WHITE, 0, gfx_background);
|
||||||
|
@ -589,7 +589,7 @@ int doTitle()
|
||||||
if (selectedOption == 3)
|
if (selectedOption == 3)
|
||||||
{
|
{
|
||||||
game_init();
|
game_init();
|
||||||
selectedOption = loadGame(continueSaveSlot);
|
selectedOption = save_load(continueSaveSlot);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send back a negative number...
|
// Send back a negative number...
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2013 Guus Sliepen
|
Copyright (C) 2011, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
Copyright (C) 2011, 2012, 2013 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2003 Parallel Realities
|
Copyright (C) 2003 Parallel Realities
|
||||||
Copyright (C) 2011 Guus Sliepen
|
Copyright (C) 2011 Guus Sliepen
|
||||||
Copyright (C) 2015, 2016 onpon4 <onpon4@riseup.net>
|
Copyright (C) 2015, 2016 Julie Marchant <onpon4@riseup.net>
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This program is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU General Public License
|
modify it under the terms of the GNU General Public License
|
||||||
|
|
Loading…
Reference in New Issue