2020-01-01 21:29:24 +01:00
|
|
|
#include <SDL.h>
|
|
|
|
#include "SoundSystem.h"
|
|
|
|
|
|
|
|
#include "UtilityClass.h"
|
|
|
|
#include "Game.h"
|
|
|
|
#include "Graphics.h"
|
|
|
|
#include "KeyPoll.h"
|
|
|
|
#include "titlerender.h"
|
|
|
|
|
|
|
|
#include "Tower.h"
|
|
|
|
#include "WarpClass.h"
|
|
|
|
#include "Labclass.h"
|
|
|
|
#include "Finalclass.h"
|
|
|
|
#include "Map.h"
|
|
|
|
|
|
|
|
#include "Screen.h"
|
|
|
|
|
|
|
|
#include "Script.h"
|
|
|
|
|
|
|
|
#include "Logic.h"
|
|
|
|
|
|
|
|
#include "Input.h"
|
|
|
|
#include "editor.h"
|
|
|
|
#include "preloader.h"
|
|
|
|
|
|
|
|
#include "FileSystemUtils.h"
|
|
|
|
#include "Network.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
scriptclass script;
|
|
|
|
|
2020-02-10 03:21:19 +01:00
|
|
|
#if !defined(NO_CUSTOM_LEVELS)
|
2020-04-02 23:43:50 +02:00
|
|
|
std::vector<edentities> edentity;
|
|
|
|
editorclass ed;
|
2020-02-10 01:53:01 +01:00
|
|
|
#endif
|
2020-01-01 21:29:24 +01:00
|
|
|
|
Allow using help/graphics/music/game/key/map/obj everywhere
This commit makes `help`, `graphics`, `music`, `game`, `key`, `map`, and
`obj` essentially static global objects that can be used everywhere.
This is useful in case we ever need to add a new function in the future,
so we don't have to bother with passing a new argument in which means we
have to pass a new argument in to the function that calls that function
which means having to pass a new argument into the function that calls
THAT function, etc. which is a real headache when working on fan mods of
the source code.
Note that this changes NONE of the existing function signatures, it
merely just makes those variables accessible everywhere in the same way
`script` and `ed` are.
Also note that some classes had to be initialized after the filesystem
was initialized, but C++ would keep initializing them before the
filesystem got initialized, because I *had* to put them at the top of
`main.cpp`, or else they wouldn't be global variables.
The only way to work around this was to use entityclass's initialization
style (which I'm pretty sure entityclass of all things doesn't need to
be initialized this way), where you actually initialize the class in an
`init()` function, and so then you do `graphics.init()` after the
filesystem initialization, AFTER doing `Graphics graphics` up at the
top.
I've had to do this for `graphics` (but only because its child
GraphicsResources `grphx` needs to be initialized this way), `music`,
and `game`. I don't think this will affect anything. Other than that,
`help`, `key`, and `map` are still using the C++-intended method of
having ClassName::ClassName() functions.
2020-01-29 08:35:03 +01:00
|
|
|
UtilityClass help;
|
|
|
|
Graphics graphics;
|
|
|
|
musicclass music;
|
|
|
|
Game game;
|
|
|
|
KeyPoll key;
|
|
|
|
mapclass map;
|
|
|
|
entityclass obj;
|
|
|
|
|
2020-01-01 21:29:24 +01:00
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
2020-02-09 00:49:03 +01:00
|
|
|
char* baseDir = NULL;
|
|
|
|
char* assetsPath = NULL;
|
2020-02-03 00:28:26 +01:00
|
|
|
|
|
|
|
for (int i = 1; i < argc; ++i) {
|
|
|
|
if (strcmp(argv[i], "-renderer") == 0) {
|
|
|
|
++i;
|
|
|
|
SDL_SetHintWithPriority(SDL_HINT_RENDER_DRIVER, argv[i], SDL_HINT_OVERRIDE);
|
2020-02-09 00:49:03 +01:00
|
|
|
} else if (strcmp(argv[i], "-basedir") == 0) {
|
|
|
|
++i;
|
|
|
|
baseDir = argv[i];
|
2020-02-03 00:28:26 +01:00
|
|
|
} else if (strcmp(argv[i], "-assets") == 0) {
|
|
|
|
++i;
|
2020-02-09 00:49:03 +01:00
|
|
|
assetsPath = argv[i];
|
2020-02-03 00:28:26 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-09 00:49:03 +01:00
|
|
|
if(!FILESYSTEM_init(argv[0], baseDir, assetsPath))
|
2020-01-01 21:29:24 +01:00
|
|
|
{
|
2020-02-03 00:28:26 +01:00
|
|
|
return 1;
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
|
|
|
|
2020-02-19 18:44:36 +01:00
|
|
|
SDL_Init(
|
|
|
|
SDL_INIT_VIDEO |
|
|
|
|
SDL_INIT_AUDIO |
|
|
|
|
SDL_INIT_JOYSTICK |
|
|
|
|
SDL_INIT_GAMECONTROLLER
|
|
|
|
);
|
|
|
|
|
2020-01-01 21:29:24 +01:00
|
|
|
NETWORK_init();
|
|
|
|
|
|
|
|
Screen gameScreen;
|
|
|
|
|
2020-04-02 23:43:50 +02:00
|
|
|
printf("\t\t\n");
|
|
|
|
printf("\t\t\n");
|
|
|
|
printf("\t\t VVVVVV\n");
|
|
|
|
printf("\t\t\n");
|
|
|
|
printf("\t\t\n");
|
|
|
|
printf("\t\t 8888888888888888 \n");
|
|
|
|
printf("\t\t88888888888888888888\n");
|
|
|
|
printf("\t\t888888 8888 88\n");
|
|
|
|
printf("\t\t888888 8888 88\n");
|
|
|
|
printf("\t\t88888888888888888888\n");
|
|
|
|
printf("\t\t88888888888888888888\n");
|
|
|
|
printf("\t\t888888 88\n");
|
|
|
|
printf("\t\t88888888 8888\n");
|
|
|
|
printf("\t\t 8888888888888888 \n");
|
|
|
|
printf("\t\t 88888888 \n");
|
|
|
|
printf("\t\t 8888888888888888 \n");
|
|
|
|
printf("\t\t88888888888888888888\n");
|
|
|
|
printf("\t\t88888888888888888888\n");
|
|
|
|
printf("\t\t88888888888888888888\n");
|
|
|
|
printf("\t\t8888 88888888 8888\n");
|
|
|
|
printf("\t\t8888 88888888 8888\n");
|
|
|
|
printf("\t\t 888888888888 \n");
|
|
|
|
printf("\t\t 8888 8888 \n");
|
|
|
|
printf("\t\t 888888 888888 \n");
|
|
|
|
printf("\t\t 888888 888888 \n");
|
|
|
|
printf("\t\t 888888 888888 \n");
|
|
|
|
printf("\t\t\n");
|
|
|
|
printf("\t\t\n");
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
//Set up screen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Load Ini
|
|
|
|
|
|
|
|
|
Allow using help/graphics/music/game/key/map/obj everywhere
This commit makes `help`, `graphics`, `music`, `game`, `key`, `map`, and
`obj` essentially static global objects that can be used everywhere.
This is useful in case we ever need to add a new function in the future,
so we don't have to bother with passing a new argument in which means we
have to pass a new argument in to the function that calls that function
which means having to pass a new argument into the function that calls
THAT function, etc. which is a real headache when working on fan mods of
the source code.
Note that this changes NONE of the existing function signatures, it
merely just makes those variables accessible everywhere in the same way
`script` and `ed` are.
Also note that some classes had to be initialized after the filesystem
was initialized, but C++ would keep initializing them before the
filesystem got initialized, because I *had* to put them at the top of
`main.cpp`, or else they wouldn't be global variables.
The only way to work around this was to use entityclass's initialization
style (which I'm pretty sure entityclass of all things doesn't need to
be initialized this way), where you actually initialize the class in an
`init()` function, and so then you do `graphics.init()` after the
filesystem initialization, AFTER doing `Graphics graphics` up at the
top.
I've had to do this for `graphics` (but only because its child
GraphicsResources `grphx` needs to be initialized this way), `music`,
and `game`. I don't think this will affect anything. Other than that,
`help`, `key`, and `map` are still using the C++-intended method of
having ClassName::ClassName() functions.
2020-01-29 08:35:03 +01:00
|
|
|
graphics.init();
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
Allow using help/graphics/music/game/key/map/obj everywhere
This commit makes `help`, `graphics`, `music`, `game`, `key`, `map`, and
`obj` essentially static global objects that can be used everywhere.
This is useful in case we ever need to add a new function in the future,
so we don't have to bother with passing a new argument in which means we
have to pass a new argument in to the function that calls that function
which means having to pass a new argument into the function that calls
THAT function, etc. which is a real headache when working on fan mods of
the source code.
Note that this changes NONE of the existing function signatures, it
merely just makes those variables accessible everywhere in the same way
`script` and `ed` are.
Also note that some classes had to be initialized after the filesystem
was initialized, but C++ would keep initializing them before the
filesystem got initialized, because I *had* to put them at the top of
`main.cpp`, or else they wouldn't be global variables.
The only way to work around this was to use entityclass's initialization
style (which I'm pretty sure entityclass of all things doesn't need to
be initialized this way), where you actually initialize the class in an
`init()` function, and so then you do `graphics.init()` after the
filesystem initialization, AFTER doing `Graphics graphics` up at the
top.
I've had to do this for `graphics` (but only because its child
GraphicsResources `grphx` needs to be initialized this way), `music`,
and `game`. I don't think this will affect anything. Other than that,
`help`, `key`, and `map` are still using the C++-intended method of
having ClassName::ClassName() functions.
2020-01-29 08:35:03 +01:00
|
|
|
music.init();
|
|
|
|
game.init();
|
2020-01-01 21:29:24 +01:00
|
|
|
game.infocus = true;
|
|
|
|
|
|
|
|
graphics.MakeTileArray();
|
|
|
|
graphics.MakeSpriteArray();
|
|
|
|
graphics.maketelearray();
|
|
|
|
|
|
|
|
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image0);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image1);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image2);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image3);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image4);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image5);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image6);
|
|
|
|
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image7);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image8);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image9);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image10);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image11);
|
|
|
|
graphics.images.push_back(graphics.grphx.im_image12);
|
|
|
|
|
|
|
|
const SDL_PixelFormat* fmt = gameScreen.GetFormat();
|
2020-03-12 08:56:06 +01:00
|
|
|
graphics.backBuffer = SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 240, fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, fmt->Amask);
|
2020-01-01 21:29:24 +01:00
|
|
|
SDL_SetSurfaceBlendMode(graphics.backBuffer, SDL_BLENDMODE_NONE);
|
2020-03-12 08:56:06 +01:00
|
|
|
graphics.footerbuffer = SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 10, fmt->BitsPerPixel, fmt->Rmask, fmt->Gmask, fmt->Bmask, fmt->Amask);
|
2020-01-25 05:32:55 +01:00
|
|
|
SDL_SetSurfaceBlendMode(graphics.footerbuffer, SDL_BLENDMODE_BLEND);
|
2020-01-25 08:30:51 +01:00
|
|
|
SDL_SetSurfaceAlphaMod(graphics.footerbuffer, 127);
|
2020-01-25 05:32:55 +01:00
|
|
|
FillRect(graphics.footerbuffer, SDL_MapRGB(fmt, 0, 0, 0));
|
2020-01-01 21:29:24 +01:00
|
|
|
graphics.Makebfont();
|
|
|
|
|
|
|
|
|
2020-01-11 01:37:23 +01:00
|
|
|
graphics.foregroundBuffer = SDL_CreateRGBSurface(SDL_SWSURFACE ,320 ,240 ,fmt->BitsPerPixel,fmt->Rmask,fmt->Gmask,fmt->Bmask,fmt->Amask );
|
|
|
|
SDL_SetSurfaceBlendMode(graphics.foregroundBuffer, SDL_BLENDMODE_NONE);
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
graphics.screenbuffer = &gameScreen;
|
|
|
|
|
|
|
|
graphics.menubuffer = SDL_CreateRGBSurface(SDL_SWSURFACE ,320 ,240 ,fmt->BitsPerPixel,fmt->Rmask,fmt->Gmask,fmt->Bmask,fmt->Amask );
|
|
|
|
SDL_SetSurfaceBlendMode(graphics.menubuffer, SDL_BLENDMODE_NONE);
|
|
|
|
|
|
|
|
graphics.towerbuffer = SDL_CreateRGBSurface(SDL_SWSURFACE ,320 ,240 ,fmt->BitsPerPixel,fmt->Rmask,fmt->Gmask,fmt->Bmask,fmt->Amask );
|
|
|
|
SDL_SetSurfaceBlendMode(graphics.towerbuffer, SDL_BLENDMODE_NONE);
|
|
|
|
|
2020-04-02 23:43:50 +02:00
|
|
|
graphics.tempBuffer = SDL_CreateRGBSurface(SDL_SWSURFACE ,320 ,240 ,fmt->BitsPerPixel,fmt->Rmask,fmt->Gmask,fmt->Bmask,fmt->Amask );
|
2020-01-01 21:29:24 +01:00
|
|
|
SDL_SetSurfaceBlendMode(graphics.tempBuffer, SDL_BLENDMODE_NONE);
|
|
|
|
|
2020-04-03 04:19:35 +02:00
|
|
|
game.gamestate = PRELOADER;
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
game.menustart = false;
|
|
|
|
game.mainmenu = 0;
|
|
|
|
|
|
|
|
map.ypos = (700-29) * 8;
|
|
|
|
map.bypos = map.ypos / 2;
|
|
|
|
|
|
|
|
//Moved screensetting init here from main menu V2.1
|
2020-03-31 02:16:02 +02:00
|
|
|
game.loadstats();
|
2020-01-13 02:45:44 +01:00
|
|
|
if (game.skipfakeload)
|
|
|
|
game.gamestate = TITLEMODE;
|
2020-04-02 23:43:50 +02:00
|
|
|
if(game.usingmmmmmm==0) music.usingmmmmmm=false;
|
|
|
|
if(game.usingmmmmmm==1) music.usingmmmmmm=true;
|
2020-01-01 21:29:24 +01:00
|
|
|
if (game.slowdown == 0) game.slowdown = 30;
|
|
|
|
|
|
|
|
switch(game.slowdown){
|
2020-04-02 23:43:50 +02:00
|
|
|
case 30: game.gameframerate=34; break;
|
|
|
|
case 24: game.gameframerate=41; break;
|
|
|
|
case 18: game.gameframerate=55; break;
|
|
|
|
case 12: game.gameframerate=83; break;
|
|
|
|
default: game.gameframerate=34; break;
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
|
|
|
|
2020-04-02 23:43:50 +02:00
|
|
|
//Check to see if you've already unlocked some achievements here from before the update
|
|
|
|
if (game.swnbestrank > 0){
|
|
|
|
if(game.swnbestrank >= 1) NETWORK_unlockAchievement("vvvvvvsupgrav5");
|
|
|
|
if(game.swnbestrank >= 2) NETWORK_unlockAchievement("vvvvvvsupgrav10");
|
|
|
|
if(game.swnbestrank >= 3) NETWORK_unlockAchievement("vvvvvvsupgrav15");
|
|
|
|
if(game.swnbestrank >= 4) NETWORK_unlockAchievement("vvvvvvsupgrav20");
|
|
|
|
if(game.swnbestrank >= 5) NETWORK_unlockAchievement("vvvvvvsupgrav30");
|
|
|
|
if(game.swnbestrank >= 6) NETWORK_unlockAchievement("vvvvvvsupgrav60");
|
|
|
|
}
|
|
|
|
|
|
|
|
if(game.unlock[5]) NETWORK_unlockAchievement("vvvvvvgamecomplete");
|
|
|
|
if(game.unlock[19]) NETWORK_unlockAchievement("vvvvvvgamecompleteflip");
|
|
|
|
if(game.unlock[20]) NETWORK_unlockAchievement("vvvvvvmaster");
|
|
|
|
|
|
|
|
if (game.bestgamedeaths > -1) {
|
|
|
|
if (game.bestgamedeaths <= 500) {
|
|
|
|
NETWORK_unlockAchievement("vvvvvvcomplete500");
|
|
|
|
}
|
|
|
|
if (game.bestgamedeaths <= 250) {
|
|
|
|
NETWORK_unlockAchievement("vvvvvvcomplete250");
|
|
|
|
}
|
|
|
|
if (game.bestgamedeaths <= 100) {
|
|
|
|
NETWORK_unlockAchievement("vvvvvvcomplete100");
|
|
|
|
}
|
|
|
|
if (game.bestgamedeaths <= 50) {
|
|
|
|
NETWORK_unlockAchievement("vvvvvvcomplete50");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(game.bestrank[0]>=3) NETWORK_unlockAchievement("vvvvvvtimetrial_station1_fixed");
|
|
|
|
if(game.bestrank[1]>=3) NETWORK_unlockAchievement("vvvvvvtimetrial_lab_fixed");
|
|
|
|
if(game.bestrank[2]>=3) NETWORK_unlockAchievement("vvvvvvtimetrial_tower_fixed");
|
|
|
|
if(game.bestrank[3]>=3) NETWORK_unlockAchievement("vvvvvvtimetrial_station2_fixed");
|
|
|
|
if(game.bestrank[4]>=3) NETWORK_unlockAchievement("vvvvvvtimetrial_warp_fixed");
|
|
|
|
if(game.bestrank[5]>=3) NETWORK_unlockAchievement("vvvvvvtimetrial_final_fixed");
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
obj.init();
|
|
|
|
|
|
|
|
volatile Uint32 time, timePrev = 0;
|
|
|
|
game.infocus = true;
|
|
|
|
key.isActive = true;
|
|
|
|
|
|
|
|
while(!key.quitProgram)
|
|
|
|
{
|
|
|
|
time = SDL_GetTicks();
|
|
|
|
|
|
|
|
// Update network per frame.
|
|
|
|
NETWORK_update();
|
|
|
|
|
|
|
|
//framerate limit to 30
|
|
|
|
Uint32 timetaken = time - timePrev;
|
|
|
|
if(game.gamestate==EDITORMODE)
|
2020-04-02 23:43:50 +02:00
|
|
|
{
|
|
|
|
if (timetaken < 24)
|
|
|
|
{
|
|
|
|
volatile Uint32 delay = 24 - timetaken;
|
|
|
|
SDL_Delay( delay );
|
|
|
|
time = SDL_GetTicks();
|
|
|
|
}
|
|
|
|
timePrev = time;
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
}else{
|
2020-04-02 23:43:50 +02:00
|
|
|
if (timetaken < game.gameframerate)
|
|
|
|
{
|
|
|
|
volatile Uint32 delay = game.gameframerate - timetaken;
|
|
|
|
SDL_Delay( delay );
|
|
|
|
time = SDL_GetTicks();
|
|
|
|
}
|
|
|
|
timePrev = time;
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
key.Poll();
|
Don't print useless false error message when toggling fullscreen
Whenever you would press Alt+Enter, or Alt+F, or on macOS Command+Enter,
or on macOS Command+F, or F11, the game would print this useless error
message to console, every single time: "Error: failed: " and it would
concatenate SDL_GetError() after it, but most of the time SDL_GetError()
is blank, so it would print just that.
Instead, what the fullscreen shortcut will now do is check the result of
the relevant SDL functions, BEFORE it decides to print an error message.
And when it DOES print an error message, it will be less vague and will
say instead "Error: toggling fullscreen failed: <output of
SDL_GetError()>".
This means Screen::ResizeScreen() and Screen::toggleFullScreen() are now
int-returning functions. Ideally, every function interfacing with SDL
would return an error code, but that's too much for this simple patch.
Additionally, I took the opportunity to clean up the surrounding
formatting of the code a bit, most notably dedenting the
keypress-clearing stuff by one tab level, converting the
shortcut-handling code to spaces, and removing commented-out code.
2020-03-13 08:23:48 +01:00
|
|
|
if(key.toggleFullscreen)
|
|
|
|
{
|
|
|
|
if(!gameScreen.isWindowed)
|
|
|
|
{
|
|
|
|
SDL_ShowCursor(SDL_DISABLE);
|
|
|
|
SDL_ShowCursor(SDL_ENABLE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SDL_ShowCursor(SDL_ENABLE);
|
|
|
|
}
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
|
Don't print useless false error message when toggling fullscreen
Whenever you would press Alt+Enter, or Alt+F, or on macOS Command+Enter,
or on macOS Command+F, or F11, the game would print this useless error
message to console, every single time: "Error: failed: " and it would
concatenate SDL_GetError() after it, but most of the time SDL_GetError()
is blank, so it would print just that.
Instead, what the fullscreen shortcut will now do is check the result of
the relevant SDL functions, BEFORE it decides to print an error message.
And when it DOES print an error message, it will be less vague and will
say instead "Error: toggling fullscreen failed: <output of
SDL_GetError()>".
This means Screen::ResizeScreen() and Screen::toggleFullScreen() are now
int-returning functions. Ideally, every function interfacing with SDL
would return an error code, but that's too much for this simple patch.
Additionally, I took the opportunity to clean up the surrounding
formatting of the code a bit, most notably dedenting the
keypress-clearing stuff by one tab level, converting the
shortcut-handling code to spaces, and removing commented-out code.
2020-03-13 08:23:48 +01:00
|
|
|
if(game.gamestate == EDITORMODE)
|
|
|
|
{
|
|
|
|
SDL_ShowCursor(SDL_ENABLE);
|
|
|
|
}
|
2020-01-01 21:29:24 +01:00
|
|
|
|
2020-03-13 23:22:37 +01:00
|
|
|
gameScreen.toggleFullScreen();
|
Don't print useless false error message when toggling fullscreen
Whenever you would press Alt+Enter, or Alt+F, or on macOS Command+Enter,
or on macOS Command+F, or F11, the game would print this useless error
message to console, every single time: "Error: failed: " and it would
concatenate SDL_GetError() after it, but most of the time SDL_GetError()
is blank, so it would print just that.
Instead, what the fullscreen shortcut will now do is check the result of
the relevant SDL functions, BEFORE it decides to print an error message.
And when it DOES print an error message, it will be less vague and will
say instead "Error: toggling fullscreen failed: <output of
SDL_GetError()>".
This means Screen::ResizeScreen() and Screen::toggleFullScreen() are now
int-returning functions. Ideally, every function interfacing with SDL
would return an error code, but that's too much for this simple patch.
Additionally, I took the opportunity to clean up the surrounding
formatting of the code a bit, most notably dedenting the
keypress-clearing stuff by one tab level, converting the
shortcut-handling code to spaces, and removing commented-out code.
2020-03-13 08:23:48 +01:00
|
|
|
game.fullscreen = !game.fullscreen;
|
|
|
|
key.toggleFullscreen = false;
|
2020-01-01 21:29:24 +01:00
|
|
|
|
Don't print useless false error message when toggling fullscreen
Whenever you would press Alt+Enter, or Alt+F, or on macOS Command+Enter,
or on macOS Command+F, or F11, the game would print this useless error
message to console, every single time: "Error: failed: " and it would
concatenate SDL_GetError() after it, but most of the time SDL_GetError()
is blank, so it would print just that.
Instead, what the fullscreen shortcut will now do is check the result of
the relevant SDL functions, BEFORE it decides to print an error message.
And when it DOES print an error message, it will be less vague and will
say instead "Error: toggling fullscreen failed: <output of
SDL_GetError()>".
This means Screen::ResizeScreen() and Screen::toggleFullScreen() are now
int-returning functions. Ideally, every function interfacing with SDL
would return an error code, but that's too much for this simple patch.
Additionally, I took the opportunity to clean up the surrounding
formatting of the code a bit, most notably dedenting the
keypress-clearing stuff by one tab level, converting the
shortcut-handling code to spaces, and removing commented-out code.
2020-03-13 08:23:48 +01:00
|
|
|
key.keymap.clear(); //we lost the input due to a new window.
|
|
|
|
game.press_left = false;
|
|
|
|
game.press_right = false;
|
|
|
|
game.press_action = true;
|
|
|
|
game.press_map = false;
|
|
|
|
}
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
game.infocus = key.isActive;
|
|
|
|
if(!game.infocus)
|
|
|
|
{
|
|
|
|
if(game.getGlobalSoundVol()> 0)
|
|
|
|
{
|
|
|
|
game.setGlobalSoundVol(0);
|
|
|
|
}
|
|
|
|
FillRect(graphics.backBuffer, 0x00000000);
|
|
|
|
graphics.bprint(5, 110, "Game paused", 196 - help.glow, 255 - help.glow, 196 - help.glow, true);
|
|
|
|
graphics.bprint(5, 120, "[click to resume]", 196 - help.glow, 255 - help.glow, 196 - help.glow, true);
|
|
|
|
graphics.bprint(5, 230, "Press M to mute in game", 164 - help.glow, 196 - help.glow, 164 - help.glow, true);
|
|
|
|
graphics.render();
|
|
|
|
//We are minimised, so lets put a bit of a delay to save CPU
|
|
|
|
SDL_Delay(100);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
switch(game.gamestate)
|
|
|
|
{
|
|
|
|
case PRELOADER:
|
|
|
|
//Render
|
2020-04-02 00:01:08 +02:00
|
|
|
preloaderrender();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
2020-04-02 23:43:50 +02:00
|
|
|
#if !defined(NO_CUSTOM_LEVELS)
|
2020-01-01 21:29:24 +01:00
|
|
|
case EDITORMODE:
|
2020-04-02 23:43:50 +02:00
|
|
|
graphics.flipmode = false;
|
2020-01-01 21:29:24 +01:00
|
|
|
//Input
|
2020-03-31 21:52:10 +02:00
|
|
|
editorinput();
|
2020-01-01 21:29:24 +01:00
|
|
|
//Render
|
2020-03-31 21:52:10 +02:00
|
|
|
editorrender();
|
2020-01-01 21:29:24 +01:00
|
|
|
////Logic
|
2020-03-31 21:52:10 +02:00
|
|
|
editorlogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
2020-04-02 23:43:50 +02:00
|
|
|
#endif
|
2020-01-01 21:29:24 +01:00
|
|
|
case TITLEMODE:
|
|
|
|
//Input
|
2020-04-01 23:52:45 +02:00
|
|
|
titleinput();
|
2020-01-01 21:29:24 +01:00
|
|
|
//Render
|
2020-04-01 23:59:19 +02:00
|
|
|
titlerender();
|
2020-01-01 21:29:24 +01:00
|
|
|
////Logic
|
2020-04-01 23:48:11 +02:00
|
|
|
titlelogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
|
|
|
case GAMEMODE:
|
|
|
|
if (map.towermode)
|
|
|
|
{
|
2020-04-02 23:43:50 +02:00
|
|
|
gameinput();
|
2020-04-01 23:59:19 +02:00
|
|
|
towerrender();
|
2020-04-01 23:48:11 +02:00
|
|
|
towerlogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
|
2020-04-03 04:26:16 +02:00
|
|
|
if (script.running)
|
2020-01-01 21:29:24 +01:00
|
|
|
{
|
2020-04-03 04:26:16 +02:00
|
|
|
script.run();
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
|
|
|
|
2020-04-03 04:26:16 +02:00
|
|
|
gameinput();
|
|
|
|
gamerender();
|
|
|
|
gamelogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
case MAPMODE:
|
2020-04-01 23:59:19 +02:00
|
|
|
maprender();
|
2020-04-03 04:26:16 +02:00
|
|
|
mapinput();
|
2020-04-01 23:48:11 +02:00
|
|
|
maplogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
|
|
|
case TELEPORTERMODE:
|
2020-04-01 23:59:19 +02:00
|
|
|
teleporterrender();
|
2020-04-03 04:26:16 +02:00
|
|
|
if(game.useteleporter)
|
2020-01-01 21:29:24 +01:00
|
|
|
{
|
2020-04-03 04:26:16 +02:00
|
|
|
teleporterinput();
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-04-03 04:26:16 +02:00
|
|
|
if (script.running)
|
2020-01-01 21:29:24 +01:00
|
|
|
{
|
2020-04-03 04:26:16 +02:00
|
|
|
script.run();
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
2020-04-03 04:26:16 +02:00
|
|
|
gameinput();
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
2020-04-01 23:48:11 +02:00
|
|
|
maplogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
|
|
|
case GAMECOMPLETE:
|
2020-04-01 23:59:19 +02:00
|
|
|
gamecompleterender();
|
2020-01-01 21:29:24 +01:00
|
|
|
//Input
|
2020-04-01 23:52:45 +02:00
|
|
|
gamecompleteinput();
|
2020-01-01 21:29:24 +01:00
|
|
|
//Logic
|
2020-04-01 23:48:11 +02:00
|
|
|
gamecompletelogic();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
|
|
|
case GAMECOMPLETE2:
|
2020-04-01 23:59:19 +02:00
|
|
|
gamecompleterender2();
|
2020-01-01 21:29:24 +01:00
|
|
|
//Input
|
2020-04-01 23:52:45 +02:00
|
|
|
gamecompleteinput2();
|
2020-01-01 21:29:24 +01:00
|
|
|
//Logic
|
2020-04-01 23:48:11 +02:00
|
|
|
gamecompletelogic2();
|
2020-01-01 21:29:24 +01:00
|
|
|
break;
|
|
|
|
case CLICKTOSTART:
|
|
|
|
help.updateglow();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
Fix frame-ordering backspacing empty line bug in script editor
There is a long-standing bug with the script editor where if you delete
the last character of a line, it IMMEDIATELY deletes the line you're on,
and then moves your cursor back to the previous line. This is annoying,
to say the least.
The reason for this is that, in the sequence of events that happens in
one frame (known as frame ordering), the code that backspaces one
character from the line when you press Backspace is ran BEFORE the code
to remove an empty line if you backspace it is ran. The former is
located in key.Poll(), and the latter is located in editorinput().
Thus, when you press Backspace, the game first runs key.Poll(), sees
that you've pressed Backspace, and dutifully removes the last character
from a line. The line is now empty. Then, when the game gets around to
the "Are you pressing Backspace on an empty line?" check in
editorinput(), it thinks that you're pressing Backspace on an empty
line, and then does the usual line-removing stuff.
And actually, when it does the check in editorinput(), it ACTUALLY asks
"Are you pressing Backspace on THIS frame and was the line empty LAST
frame?" because it's checking against its own copy of the input buffer,
before copying the input buffer to its own local copy. So the problem
only happens if you press and hold Backspace for more than 1 frame.
It's a small consolation prize for this annoyance, getting to
tap-tap-tap Backspace in the hopes that you only press it for 1 frame,
while in the middle of something more important to do like, oh I don't
know, writing a script.
So there are two potential solutions here:
(1) Just change the frame ordering around.
This is risky to say the least, because I'm not sure what behavior
depends on exactly which frame order. It's not like it's key.Poll()
and then IMMEDIATELY afterwards editorinput() is run, it's more
like key.Poll(), some things that obviously depend on key.Poll()
running before them, and THEN editorinput(). Also, editorinput() is
only one possible thing that could be ran afterwards, on the next
frame we could be running something else entirely instead.
(2) Add a kludge variable to signal when the line is ALREADY empty so
the game doesn't re-check the already-empty line and conclude that
you're already immediately backspacing an empty line.
I went with (2) for this commit, and I've added the kludge variable
key.linealreadyemptykludge.
However, that by itself isn't enough to fix it. It only adds about a
frame or so of delay before the game goes right back to saying "Oh,
you're ALREADY somehow pressing backspace again? I'll just delete this
line real quick" and the behavior is basically the same as before,
except now you have to hit Backspace for TWO frames or less instead of
one in order to not have it happen.
What we need is to have a delay set as well, when the game deletes the
last line of a char. So I set ed.keydelay to 6 as well if editorinput()
sses that key.linealreadyemptykludge is on.
2020-01-19 03:17:46 +01:00
|
|
|
//We did editorinput, now it's safe to turn this off
|
|
|
|
key.linealreadyemptykludge = false;
|
|
|
|
|
2020-01-01 21:29:24 +01:00
|
|
|
if (game.savemystats)
|
|
|
|
{
|
|
|
|
game.savemystats = false;
|
2020-03-31 02:16:02 +02:00
|
|
|
game.savestats();
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
//Mute button
|
2020-04-02 23:43:50 +02:00
|
|
|
#if !defined(NO_CUSTOM_LEVELS)
|
2020-02-10 01:53:01 +01:00
|
|
|
bool inEditor = ed.textentry || ed.scripthelppage == 1;
|
2020-04-02 23:43:50 +02:00
|
|
|
#else
|
2020-02-10 01:53:01 +01:00
|
|
|
bool inEditor = false;
|
2020-04-02 23:43:50 +02:00
|
|
|
#endif
|
2020-02-10 01:53:01 +01:00
|
|
|
if (key.isDown(KEYBOARD_m) && game.mutebutton<=0 && !inEditor)
|
2020-01-01 21:29:24 +01:00
|
|
|
{
|
|
|
|
game.mutebutton = 8;
|
|
|
|
if (game.muted)
|
|
|
|
{
|
|
|
|
game.muted = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
game.muted = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(game.mutebutton>0)
|
|
|
|
{
|
|
|
|
game.mutebutton--;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (game.muted)
|
|
|
|
{
|
2020-04-03 04:19:35 +02:00
|
|
|
game.globalsound = 0;
|
|
|
|
Mix_VolumeMusic(0) ;
|
|
|
|
Mix_Volume(-1,0);
|
2020-01-01 21:29:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!game.muted && game.globalsound == 0)
|
|
|
|
{
|
|
|
|
game.globalsound = 1;
|
|
|
|
Mix_VolumeMusic(MIX_MAX_VOLUME) ;
|
|
|
|
Mix_Volume(-1,MIX_MAX_VOLUME);
|
|
|
|
}
|
|
|
|
|
2020-03-05 03:28:39 +01:00
|
|
|
if (key.resetWindow)
|
|
|
|
{
|
|
|
|
key.resetWindow = false;
|
|
|
|
gameScreen.ResizeScreen(-1, -1);
|
|
|
|
}
|
2020-01-01 21:29:24 +01:00
|
|
|
|
|
|
|
music.processmusic();
|
|
|
|
graphics.processfade();
|
|
|
|
game.gameclock();
|
|
|
|
gameScreen.FlipScreen();
|
|
|
|
}
|
|
|
|
|
2020-03-31 02:16:02 +02:00
|
|
|
game.savestats();
|
2020-01-01 21:29:24 +01:00
|
|
|
NETWORK_shutdown();
|
|
|
|
SDL_Quit();
|
|
|
|
FILESYSTEM_deinit();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|