mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-05 10:49:41 +01:00
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/editor.cpp

5897 lines
181 KiB
C++
Raw Normal View History

Add option to allow custom levels when the editor is disabled
2020-02-10 03:21:19 +01:00
#if !defined(NO_CUSTOM_LEVELS)
Add option to compile without the level editor
2020-02-10 01:53:01 +01:00
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
#define ED_DEFINITION
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "editor.h"
Remove unneeded <algorithm> includes One of these days, I need to get around to running Include What You Use on this codebase. Until then, while I was working on #624, I noticed these; I'm removing them now.
2021-02-20 05:58:37 +01:00
#include <algorithm>
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include <stdio.h>
#include <string>
#include <tinyxml2.h>
#include <utf8/unchecked.h>
Fix 1-frame glitch when going to in-game options from edsettings The menu creation of Graphic Options or Game Options, as well as the map.nexttowercolour() call, all need to be deferred until the end of the frame.
2021-03-19 05:14:40 +01:00
#include "DeferCallbacks.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Entity.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "Enums.h"
#include "FileSystemUtils.h"
#include "Graphics.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "KeyPoll.h"
#include "Map.h"
Separate includes into sections and alphabetize them Okay, so basically here's the include layout that this game now consistently uses: [The "main" header file, if any (e.g. Graphics.h for Graphics.cpp)] [blank line] [All system includes, such as tinyxml2/physfs/utfcpp/SDL] [blank line] [All project includes, such as Game.h/Entity.h/etc.] And if applicable, another blank line, and then some special-case include screwy stuff (take a look at editor.cpp or FileSystemUtils.cpp, for example, they have ifdefs and defines with their includes).
2020-07-19 21:43:29 +02:00
#include "Music.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Script.h"
Remove unnecessary includes from header files Including a header file inside another header file means a bunch of files are going to be unnecessarily recompiled whenever that inner header file is changed. So I minimized the amount of header files included in a header file, and only included the ones that were necessary (system includes don't count, I'm only talking about includes from within this project). Then the includes are only in the .cpp files themselves. This also minimizes problems such as a NO_CUSTOM_LEVELS build failing because some file depended on an include that got included in editor.h, which is another benefit of removing unnecessary includes from header files.
2020-07-19 21:05:41 +02:00
#include "UtilityClass.h"
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
#include "XMLUtils.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add #define __STDC_FORMAT_MACROS This define is needed in order for the SCNx32/SCNu32 in find_tag() to be compiled correctly on older `glibc`s.
2020-06-18 00:49:40 +02:00
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS
#endif
Add #define _POSIX_SOURCE This is needed for MinGW when compiling C++98, apparently. I put it in an if-guard because otherwise there'll be a warning from MY compiler about redefinitions.
2020-06-18 01:06:15 +02:00
#ifndef _POSIX_SOURCE
#define _POSIX_SOURCE
#endif
Support hex entities in metadata
2020-06-16 02:31:54 +02:00
#include <inttypes.h>
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
edlevelclass::edlevelclass(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
tileset=0;
tilecol=0;
warpdir=0;
platx1=0;
platy1=0;
platx2=320;
platy2=240;
platv=4;
enemyx1=0;
enemyy1=0;
enemyx2=320;
enemyy2=240;
enemytype=0;
directmode=0;
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
editorclass::editorclass(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//We create a blank map
Turn ed.contents/vmult into arrays They're always the same size, so there's no need for them to be vectors. Also made the number of elements in ed.level/kludgewarpdir controllable by maxwidth/maxheight. I removed editorclass::saveconvertor() because I didn't want to convert it to treat ed.contents like an array, because it's unused so I'd have no way of testing it, plus it's also unused so it doesn't matter. Might as well get rid of it.
2020-07-03 11:54:31 +02:00
SDL_memset(contents, 0, sizeof(contents));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Turn ed.contents/vmult into arrays They're always the same size, so there's no need for them to be vectors. Also made the number of elements in ed.level/kludgewarpdir controllable by maxwidth/maxheight. I removed editorclass::saveconvertor() because I didn't want to convert it to treat ed.contents like an array, because it's unused so I'd have no way of testing it, plus it's also unused so it doesn't matter. Might as well get rid of it.
2020-07-03 11:54:31 +02:00
for (size_t i = 0; i < SDL_arraysize(vmult); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Turn ed.contents/vmult into arrays They're always the same size, so there's no need for them to be vectors. Also made the number of elements in ed.level/kludgewarpdir controllable by maxwidth/maxheight. I removed editorclass::saveconvertor() because I didn't want to convert it to treat ed.contents like an array, because it's unused so I'd have no way of testing it, plus it's also unused so it doesn't matter. Might as well get rid of it.
2020-07-03 11:54:31 +02:00
vmult[i] = i * 40 * maxwidth;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
reset();
}
// comparison, not case sensitive.
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static bool compare_nocase (std::string first, std::string second)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
unsigned int i=0;
while ( (i<first.length()) && (i<second.length()) )
{
Use SDL_tolower() instead of libc tolower() in compare_nocase() This is to avoid having to depend on libc as much as possible.
2020-07-04 06:48:07 +02:00
if (SDL_tolower(first[i])<SDL_tolower(second[i]))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
return true;
Use SDL_tolower() instead of libc tolower() in compare_nocase() This is to avoid having to depend on libc as much as possible.
2020-07-04 06:48:07 +02:00
else if (SDL_tolower(first[i])>SDL_tolower(second[i]))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
return false;
++i;
}
if (first.length()<second.length())
return true;
else
return false;
}
Refactor level dir listing to not use STL data marshalling Note that level dir listing still uses plenty of STL (including the end product - the `LevelMetaData` struct - which, for the purposes of 2.3, is okay enough (2.4 should remove STL usage entirely)); it's just that the initial act of iterating over the levels directory no longer takes four or SIX(!!!) heap allocations (not counting reallocations and other heap allocations this patch does not remove), and no longer does any data marshalling. Like text splitting, and binary blob extra indice grabbing, the current approach that FILESYSTEM_getLevelDirFileNames() uses is a temporary std::vector of std::strings as a middleman to store all the filenames, and the game iterates over that std::vector to grab each level metadata. Except, it's even worse in this case, because PHYSFS_enumerateFiles() ALREADY does a heap allocation. Oh, and FILESYSTEM_getLevelDirFileNames() gets called two or three times. Yeah, let me explain: 1. FILESYSTEM_getLevelDirFileNames() calls PHYSFS_enumerateFiles(). 2. PHYSFS_enumerateFiles() allocates an array of pointers to arrays of chars on the heap. For each filename, it will: a. Allocate an array of chars for the filename. b. Reallocate the array of pointers to add the pointer to the above char array. (In this step, it also inserts the filename in alphabetically - without any further allocations, as far as I know - but this is a COMPLETELY unnecessary step, because we are going to sort the list of levels by ourselves via the metadata title in the end anyways.) 3. FILESYSTEM_getLevelDirFileNames() iterates over the PhysFS list, and allocates an std::vector on the heap to shove the list into. Then, for each filename, it will: a. Allocate an std::string, initialized to "levels/". b. Append the filename to the std::string above. This will most likely require a re-allocation. c. Duplicate the std::string - which requires allocating more memory again - to put it into the std::vector. (Compared to the PhysFS list above, the std::vector does less reallocations; it however will still end up reallocating a certain amount of times in the end.) 4. FILESYSTEM_getLevelDirFileNames() will free the PhysFS list. 5. Then to get the std::vector<std::string> back to the caller, we end up having to reallocate the std::vector again - reallocating every single std::string inside it, too - to give it back to the caller. And to top it all off, FILESYSTEM_getLevelDirFileNames() is guaranteed to either be called two times, or three times. This is because editorclass::getDirectoryData() will call editorclass::loadZips(), which will unconditionally call FILESYSTEM_getLevelDirFileNames(), then call it AGAIN if a zip was found. Then once the function returns, getDirectoryData() will still unconditionally call FILESYSTEM_getLevelDirFileNames(). This smells like someone bolting something on without regard for the whole picture of the system, but whatever; I can clean up their mess just fine. So, what do I do about this? Well, just like I did with text splitting and binary blob extras, make the final for-loop - the one that does the actual metadata parsing - more immediate. So how do I do that? Well, PhysFS has a function named PHYSFS_enumerate(). PHYSFS_enumerateFiles(), in fact, uses this function internally, and is basically just a wrapper with some allocation and alphabetization. PHYSFS_enumerate() takes in a pointer to a function, which it will call for every single entry that it iterates over. It also lets you pass in another arbitrary pointer that it leaves alone, which I use to pass through a function pointer that is the actual callback. So to clarify, there are two callbacks - one callback is passed through into another callback that gets passed through to PHYSFS_enumerate(). The callback that gets passed to PHYSFS_enumerate() is always the same, but the callback that gets passed through the callback can be different (if you look at the calling code, you can see that one caller passes through a normal level metadata callback; the other passes through a zip file callback). Furthermore, I've also cleaned it up so that if editorclass::loadZips() finds a zip file, it won't iterate over all the files in the levels directory a third time. Instead, the level directory only gets iterated over twice - once to check for zips, and another to load every level plus all zips; the second time is when all the heap allocations happen. And with that, level list loading now uses less STL templated stuff and much less heap allocations. Also, ed.directoryList basically has no reason to exist other than being a temporary std::vector, so I've removed it. This further decreases memory usage, depending on how many levels you have in your levels folder (I know that I usually have a lot and don't really ever clean it up, lol). Lastly, in the callback passed to PhysFS, `builtLocation` is actually no longer hardcoded to just the `levels` directory, since instead we now use the `origdir` variable that PhysFS passes us. So that's good, too.
2021-02-19 03:42:13 +01:00
static void levelZipCallback(const char* filename)
Fixed some custom asset bugs, added .zip level loading Main game would retain custom level assets, now fixed. Also, custom fonts load properly. Finally, levels can be stored as a zip and placed in the levels folder, with the .vvvvvv file at the root of the zip and custom asset folders (graphics, sounds etc) also at the root.
2020-06-03 20:05:09 +02:00
{
Ignore directories when loading level metadata Otherwise, this would produce a superfluous warning message in the console. Directories are now ignored and never attempted to be opened; so now any warning messages printed out are genuine file that something has genuinely gone wrong with. Well, there's still a warning message printed if there's a symlink to a directory; this is rarer, but it's still a false positive.
2021-03-05 01:42:02 +01:00
if (!FILESYSTEM_isFile(filename))
{
return;
}
Remove std::strings from levelZipCallback() There's basically no reason to use heap-allocated strings here, so it's all gone now.
2021-02-27 01:03:56 +01:00
if (endsWith(filename, ".zip"))
Fixed some custom asset bugs, added .zip level loading Main game would retain custom level assets, now fixed. Also, custom fonts load properly. Finally, levels can be stored as a zip and placed in the levels folder, with the .vvvvvv file at the root of the zip and custom asset folders (graphics, sounds etc) also at the root.
2020-06-03 20:05:09 +02:00
{
Abstract zip loading to FileSystemUtils editor.cpp no longer calls PhysFS functions directly; its physfs.h include can now be dropped.
2021-03-05 01:05:06 +01:00
FILESYSTEM_loadZip(filename);
Fixed some custom asset bugs, added .zip level loading Main game would retain custom level assets, now fixed. Also, custom fonts load properly. Finally, levels can be stored as a zip and placed in the levels folder, with the .vvvvvv file at the root of the zip and custom asset folders (graphics, sounds etc) also at the root.
2020-06-03 20:05:09 +02:00
}
Refactor level dir listing to not use STL data marshalling Note that level dir listing still uses plenty of STL (including the end product - the `LevelMetaData` struct - which, for the purposes of 2.3, is okay enough (2.4 should remove STL usage entirely)); it's just that the initial act of iterating over the levels directory no longer takes four or SIX(!!!) heap allocations (not counting reallocations and other heap allocations this patch does not remove), and no longer does any data marshalling. Like text splitting, and binary blob extra indice grabbing, the current approach that FILESYSTEM_getLevelDirFileNames() uses is a temporary std::vector of std::strings as a middleman to store all the filenames, and the game iterates over that std::vector to grab each level metadata. Except, it's even worse in this case, because PHYSFS_enumerateFiles() ALREADY does a heap allocation. Oh, and FILESYSTEM_getLevelDirFileNames() gets called two or three times. Yeah, let me explain: 1. FILESYSTEM_getLevelDirFileNames() calls PHYSFS_enumerateFiles(). 2. PHYSFS_enumerateFiles() allocates an array of pointers to arrays of chars on the heap. For each filename, it will: a. Allocate an array of chars for the filename. b. Reallocate the array of pointers to add the pointer to the above char array. (In this step, it also inserts the filename in alphabetically - without any further allocations, as far as I know - but this is a COMPLETELY unnecessary step, because we are going to sort the list of levels by ourselves via the metadata title in the end anyways.) 3. FILESYSTEM_getLevelDirFileNames() iterates over the PhysFS list, and allocates an std::vector on the heap to shove the list into. Then, for each filename, it will: a. Allocate an std::string, initialized to "levels/". b. Append the filename to the std::string above. This will most likely require a re-allocation. c. Duplicate the std::string - which requires allocating more memory again - to put it into the std::vector. (Compared to the PhysFS list above, the std::vector does less reallocations; it however will still end up reallocating a certain amount of times in the end.) 4. FILESYSTEM_getLevelDirFileNames() will free the PhysFS list. 5. Then to get the std::vector<std::string> back to the caller, we end up having to reallocate the std::vector again - reallocating every single std::string inside it, too - to give it back to the caller. And to top it all off, FILESYSTEM_getLevelDirFileNames() is guaranteed to either be called two times, or three times. This is because editorclass::getDirectoryData() will call editorclass::loadZips(), which will unconditionally call FILESYSTEM_getLevelDirFileNames(), then call it AGAIN if a zip was found. Then once the function returns, getDirectoryData() will still unconditionally call FILESYSTEM_getLevelDirFileNames(). This smells like someone bolting something on without regard for the whole picture of the system, but whatever; I can clean up their mess just fine. So, what do I do about this? Well, just like I did with text splitting and binary blob extras, make the final for-loop - the one that does the actual metadata parsing - more immediate. So how do I do that? Well, PhysFS has a function named PHYSFS_enumerate(). PHYSFS_enumerateFiles(), in fact, uses this function internally, and is basically just a wrapper with some allocation and alphabetization. PHYSFS_enumerate() takes in a pointer to a function, which it will call for every single entry that it iterates over. It also lets you pass in another arbitrary pointer that it leaves alone, which I use to pass through a function pointer that is the actual callback. So to clarify, there are two callbacks - one callback is passed through into another callback that gets passed through to PHYSFS_enumerate(). The callback that gets passed to PHYSFS_enumerate() is always the same, but the callback that gets passed through the callback can be different (if you look at the calling code, you can see that one caller passes through a normal level metadata callback; the other passes through a zip file callback). Furthermore, I've also cleaned it up so that if editorclass::loadZips() finds a zip file, it won't iterate over all the files in the levels directory a third time. Instead, the level directory only gets iterated over twice - once to check for zips, and another to load every level plus all zips; the second time is when all the heap allocations happen. And with that, level list loading now uses less STL templated stuff and much less heap allocations. Also, ed.directoryList basically has no reason to exist other than being a temporary std::vector, so I've removed it. This further decreases memory usage, depending on how many levels you have in your levels folder (I know that I usually have a lot and don't really ever clean it up, lol). Lastly, in the callback passed to PhysFS, `builtLocation` is actually no longer hardcoded to just the `levels` directory, since instead we now use the `origdir` variable that PhysFS passes us. So that's good, too.
2021-02-19 03:42:13 +01:00
}
Fixed some custom asset bugs, added .zip level loading Main game would retain custom level assets, now fixed. Also, custom fonts load properly. Finally, levels can be stored as a zip and placed in the levels folder, with the .vvvvvv file at the root of the zip and custom asset folders (graphics, sounds etc) also at the root.
2020-06-03 20:05:09 +02:00
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::loadZips(void)
Refactor level dir listing to not use STL data marshalling Note that level dir listing still uses plenty of STL (including the end product - the `LevelMetaData` struct - which, for the purposes of 2.3, is okay enough (2.4 should remove STL usage entirely)); it's just that the initial act of iterating over the levels directory no longer takes four or SIX(!!!) heap allocations (not counting reallocations and other heap allocations this patch does not remove), and no longer does any data marshalling. Like text splitting, and binary blob extra indice grabbing, the current approach that FILESYSTEM_getLevelDirFileNames() uses is a temporary std::vector of std::strings as a middleman to store all the filenames, and the game iterates over that std::vector to grab each level metadata. Except, it's even worse in this case, because PHYSFS_enumerateFiles() ALREADY does a heap allocation. Oh, and FILESYSTEM_getLevelDirFileNames() gets called two or three times. Yeah, let me explain: 1. FILESYSTEM_getLevelDirFileNames() calls PHYSFS_enumerateFiles(). 2. PHYSFS_enumerateFiles() allocates an array of pointers to arrays of chars on the heap. For each filename, it will: a. Allocate an array of chars for the filename. b. Reallocate the array of pointers to add the pointer to the above char array. (In this step, it also inserts the filename in alphabetically - without any further allocations, as far as I know - but this is a COMPLETELY unnecessary step, because we are going to sort the list of levels by ourselves via the metadata title in the end anyways.) 3. FILESYSTEM_getLevelDirFileNames() iterates over the PhysFS list, and allocates an std::vector on the heap to shove the list into. Then, for each filename, it will: a. Allocate an std::string, initialized to "levels/". b. Append the filename to the std::string above. This will most likely require a re-allocation. c. Duplicate the std::string - which requires allocating more memory again - to put it into the std::vector. (Compared to the PhysFS list above, the std::vector does less reallocations; it however will still end up reallocating a certain amount of times in the end.) 4. FILESYSTEM_getLevelDirFileNames() will free the PhysFS list. 5. Then to get the std::vector<std::string> back to the caller, we end up having to reallocate the std::vector again - reallocating every single std::string inside it, too - to give it back to the caller. And to top it all off, FILESYSTEM_getLevelDirFileNames() is guaranteed to either be called two times, or three times. This is because editorclass::getDirectoryData() will call editorclass::loadZips(), which will unconditionally call FILESYSTEM_getLevelDirFileNames(), then call it AGAIN if a zip was found. Then once the function returns, getDirectoryData() will still unconditionally call FILESYSTEM_getLevelDirFileNames(). This smells like someone bolting something on without regard for the whole picture of the system, but whatever; I can clean up their mess just fine. So, what do I do about this? Well, just like I did with text splitting and binary blob extras, make the final for-loop - the one that does the actual metadata parsing - more immediate. So how do I do that? Well, PhysFS has a function named PHYSFS_enumerate(). PHYSFS_enumerateFiles(), in fact, uses this function internally, and is basically just a wrapper with some allocation and alphabetization. PHYSFS_enumerate() takes in a pointer to a function, which it will call for every single entry that it iterates over. It also lets you pass in another arbitrary pointer that it leaves alone, which I use to pass through a function pointer that is the actual callback. So to clarify, there are two callbacks - one callback is passed through into another callback that gets passed through to PHYSFS_enumerate(). The callback that gets passed to PHYSFS_enumerate() is always the same, but the callback that gets passed through the callback can be different (if you look at the calling code, you can see that one caller passes through a normal level metadata callback; the other passes through a zip file callback). Furthermore, I've also cleaned it up so that if editorclass::loadZips() finds a zip file, it won't iterate over all the files in the levels directory a third time. Instead, the level directory only gets iterated over twice - once to check for zips, and another to load every level plus all zips; the second time is when all the heap allocations happen. And with that, level list loading now uses less STL templated stuff and much less heap allocations. Also, ed.directoryList basically has no reason to exist other than being a temporary std::vector, so I've removed it. This further decreases memory usage, depending on how many levels you have in your levels folder (I know that I usually have a lot and don't really ever clean it up, lol). Lastly, in the callback passed to PhysFS, `builtLocation` is actually no longer hardcoded to just the `levels` directory, since instead we now use the `origdir` variable that PhysFS passes us. So that's good, too.
2021-02-19 03:42:13 +01:00
{
FILESYSTEM_enumerateLevelDirFileNames(levelZipCallback);
Fixed some custom asset bugs, added .zip level loading Main game would retain custom level assets, now fixed. Also, custom fonts load properly. Finally, levels can be stored as a zip and placed in the levels folder, with the .vvvvvv file at the root of the zip and custom asset folders (graphics, sounds etc) also at the root.
2020-06-03 20:05:09 +02:00
}
Add static keywords to replace_all and tag finder funcs These functions will never be used outside editor.cpp; they should therefore be marked with the `static` keyword.
2021-02-18 09:08:31 +01:00
static void replace_all(std::string& str, const std::string& from, const std::string& to)
Add replace_all() This is just a function that will be used in the optimized tag-finding function.
2020-04-17 23:19:56 +02:00
{
if (from.empty())
{
return;
}
size_t start_pos = 0;
while ((start_pos = str.find(from, start_pos)) != std::string::npos)
{
str.replace(start_pos, from.length(), to);
start_pos += to.length(); //In case `to` contains `from`, like replacing 'x' with 'yx'
}
}
Add static keywords to replace_all and tag finder funcs These functions will never be used outside editor.cpp; they should therefore be marked with the `static` keyword.
2021-02-18 09:08:31 +01:00
static std::string find_tag(const std::string& buf, const std::string& start, const std::string& end)
Add find_tag() This simply finds a given tag in a buffer and returns what's inside that tag, making sure to parse XML entities and such.
2020-04-17 23:56:38 +02:00
{
size_t tag = buf.find(start);
if (tag == std::string::npos)
{
//No start tag
return "";
}
size_t tag_start = tag + start.size();
size_t tag_close = buf.find(end, tag_start);
if (tag_close == std::string::npos)
{
//No close tag
return "";
}
size_t tag_len = tag_close - tag_start;
std::string value(buf.substr(tag_start, tag_len));
//Encode special XML entities
replace_all(value, "&quot;", "\"");
replace_all(value, "&amp;", "&");
replace_all(value, "&apos;", "'");
replace_all(value, "&lt;", "<");
replace_all(value, "&gt;", ">");
//Encode general XML entities
size_t start_pos = 0;
while ((start_pos = value.find("&#", start_pos)) != std::string::npos)
{
Fix out-of-bounds indexing with malformed XML entities in find_tag() find_tag() would commit out-of-bounds indexing if someone made a level file with malformed XML entity encodings in the metadata tags. This would happen if the end of the string followed immediately after an ampersand and hash, or if there wasn't a semicolon ending an XML entity. Valgrind complains about these, so I've fixed it.
2021-02-12 01:07:25 +01:00
if (start_pos + 2 >= value.length())
{
return "";
}
Support hex entities in metadata
2020-06-16 02:31:54 +02:00
bool hex = value[start_pos + 2] == 'x';
Add find_tag() This simply finds a given tag in a buffer and returns what's inside that tag, making sure to parse XML entities and such.
2020-04-17 23:56:38 +02:00
size_t end = value.find(';', start_pos);
Fix out-of-bounds indexing with malformed XML entities in find_tag() find_tag() would commit out-of-bounds indexing if someone made a level file with malformed XML entity encodings in the metadata tags. This would happen if the end of the string followed immediately after an ampersand and hash, or if there wasn't a semicolon ending an XML entity. Valgrind complains about these, so I've fixed it.
2021-02-12 01:07:25 +01:00
if (end == std::string::npos)
{
return "";
}
Support hex entities in metadata
2020-06-16 02:31:54 +02:00
size_t real_start = start_pos + 2 + ((int) hex);
std::string number(value.substr(real_start, end - real_start));
Add find_tag() This simply finds a given tag in a buffer and returns what's inside that tag, making sure to parse XML entities and such.
2020-04-17 23:56:38 +02:00
Refactor is_positive_num() to use C-strings This makes the future move to C easier, as well as just shows that it's plain unnecessary to use an std::string here.
2021-02-12 01:36:22 +01:00
if (!is_positive_num(number.c_str(), hex))
Add find_tag() This simply finds a given tag in a buffer and returns what's inside that tag, making sure to parse XML entities and such.
2020-04-17 23:56:38 +02:00
{
return "";
}
Support hex entities in metadata
2020-06-16 02:31:54 +02:00
uint32_t character = 0;
if (hex)
{
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
SDL_sscanf(number.c_str(), "%" SCNx32, &character);
Support hex entities in metadata
2020-06-16 02:31:54 +02:00
}
else
{
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
SDL_sscanf(number.c_str(), "%" SCNu32, &character);
Support hex entities in metadata
2020-06-16 02:31:54 +02:00
}
uint32_t utf32[] = {character, 0};
Add find_tag() This simply finds a given tag in a buffer and returns what's inside that tag, making sure to parse XML entities and such.
2020-04-17 23:56:38 +02:00
std::string utf8;
utf8::unchecked::utf32to8(utf32, utf32 + 1, std::back_inserter(utf8));
value.replace(start_pos, end - start_pos + 1, utf8);
}
return value;
}
Add tag finder functions To find each individual tag quickly, to optimize levels list loading. I opted to not read the tags <Created>, <Modified>, and <Modifiers> as they're actually pretty useless. Also I've added a tag finder for <MetaData> but it's not meant to be used directly, it's only used to check that the tag exists.
2020-04-18 00:06:42 +02:00
#define TAG_FINDER(NAME, TAG) \
Add static keywords to replace_all and tag finder funcs These functions will never be used outside editor.cpp; they should therefore be marked with the `static` keyword.
2021-02-18 09:08:31 +01:00
static std::string NAME(const std::string& buf) \
Add tag finder functions To find each individual tag quickly, to optimize levels list loading. I opted to not read the tags <Created>, <Modified>, and <Modifiers> as they're actually pretty useless. Also I've added a tag finder for <MetaData> but it's not meant to be used directly, it's only used to check that the tag exists.
2020-04-18 00:06:42 +02:00
{ \
return find_tag(buf, "<" TAG ">", "</" TAG ">"); \
}
TAG_FINDER(find_metadata, "MetaData"); //only for checking that it exists
TAG_FINDER(find_creator, "Creator");
TAG_FINDER(find_title, "Title");
TAG_FINDER(find_desc1, "Desc1");
TAG_FINDER(find_desc2, "Desc2");
TAG_FINDER(find_desc3, "Desc3");
TAG_FINDER(find_website, "website");
#undef TAG_FINDER
Refactor level dir listing to not use STL data marshalling Note that level dir listing still uses plenty of STL (including the end product - the `LevelMetaData` struct - which, for the purposes of 2.3, is okay enough (2.4 should remove STL usage entirely)); it's just that the initial act of iterating over the levels directory no longer takes four or SIX(!!!) heap allocations (not counting reallocations and other heap allocations this patch does not remove), and no longer does any data marshalling. Like text splitting, and binary blob extra indice grabbing, the current approach that FILESYSTEM_getLevelDirFileNames() uses is a temporary std::vector of std::strings as a middleman to store all the filenames, and the game iterates over that std::vector to grab each level metadata. Except, it's even worse in this case, because PHYSFS_enumerateFiles() ALREADY does a heap allocation. Oh, and FILESYSTEM_getLevelDirFileNames() gets called two or three times. Yeah, let me explain: 1. FILESYSTEM_getLevelDirFileNames() calls PHYSFS_enumerateFiles(). 2. PHYSFS_enumerateFiles() allocates an array of pointers to arrays of chars on the heap. For each filename, it will: a. Allocate an array of chars for the filename. b. Reallocate the array of pointers to add the pointer to the above char array. (In this step, it also inserts the filename in alphabetically - without any further allocations, as far as I know - but this is a COMPLETELY unnecessary step, because we are going to sort the list of levels by ourselves via the metadata title in the end anyways.) 3. FILESYSTEM_getLevelDirFileNames() iterates over the PhysFS list, and allocates an std::vector on the heap to shove the list into. Then, for each filename, it will: a. Allocate an std::string, initialized to "levels/". b. Append the filename to the std::string above. This will most likely require a re-allocation. c. Duplicate the std::string - which requires allocating more memory again - to put it into the std::vector. (Compared to the PhysFS list above, the std::vector does less reallocations; it however will still end up reallocating a certain amount of times in the end.) 4. FILESYSTEM_getLevelDirFileNames() will free the PhysFS list. 5. Then to get the std::vector<std::string> back to the caller, we end up having to reallocate the std::vector again - reallocating every single std::string inside it, too - to give it back to the caller. And to top it all off, FILESYSTEM_getLevelDirFileNames() is guaranteed to either be called two times, or three times. This is because editorclass::getDirectoryData() will call editorclass::loadZips(), which will unconditionally call FILESYSTEM_getLevelDirFileNames(), then call it AGAIN if a zip was found. Then once the function returns, getDirectoryData() will still unconditionally call FILESYSTEM_getLevelDirFileNames(). This smells like someone bolting something on without regard for the whole picture of the system, but whatever; I can clean up their mess just fine. So, what do I do about this? Well, just like I did with text splitting and binary blob extras, make the final for-loop - the one that does the actual metadata parsing - more immediate. So how do I do that? Well, PhysFS has a function named PHYSFS_enumerate(). PHYSFS_enumerateFiles(), in fact, uses this function internally, and is basically just a wrapper with some allocation and alphabetization. PHYSFS_enumerate() takes in a pointer to a function, which it will call for every single entry that it iterates over. It also lets you pass in another arbitrary pointer that it leaves alone, which I use to pass through a function pointer that is the actual callback. So to clarify, there are two callbacks - one callback is passed through into another callback that gets passed through to PHYSFS_enumerate(). The callback that gets passed to PHYSFS_enumerate() is always the same, but the callback that gets passed through the callback can be different (if you look at the calling code, you can see that one caller passes through a normal level metadata callback; the other passes through a zip file callback). Furthermore, I've also cleaned it up so that if editorclass::loadZips() finds a zip file, it won't iterate over all the files in the levels directory a third time. Instead, the level directory only gets iterated over twice - once to check for zips, and another to load every level plus all zips; the second time is when all the heap allocations happen. And with that, level list loading now uses less STL templated stuff and much less heap allocations. Also, ed.directoryList basically has no reason to exist other than being a temporary std::vector, so I've removed it. This further decreases memory usage, depending on how many levels you have in your levels folder (I know that I usually have a lot and don't really ever clean it up, lol). Lastly, in the callback passed to PhysFS, `builtLocation` is actually no longer hardcoded to just the `levels` directory, since instead we now use the `origdir` variable that PhysFS passes us. So that's good, too.
2021-02-19 03:42:13 +01:00
static void levelMetaDataCallback(const char* filename)
{
extern editorclass ed;
LevelMetaData temp;
std::string filename_ = filename;
Ignore zip files in level metadata loading Zip files that have been successfully mounted in editorclass::loadZips() will now be ignored when the game does its second pass over the levels directory. Otherwise, this would produce a superfluous error message, because the game would attempt to parse the zip file as a level file (when it's not a level file and is in fact a binary file).
2021-03-05 01:47:18 +01:00
if (!FILESYSTEM_isFile(filename) || FILESYSTEM_isMounted(filename))
Ignore directories when loading level metadata Otherwise, this would produce a superfluous warning message in the console. Directories are now ignored and never attempted to be opened; so now any warning messages printed out are genuine file that something has genuinely gone wrong with. Well, there's still a warning message printed if there's a symlink to a directory; this is rarer, but it's still a false positive.
2021-03-05 01:42:02 +01:00
{
return;
}
Refactor level dir listing to not use STL data marshalling Note that level dir listing still uses plenty of STL (including the end product - the `LevelMetaData` struct - which, for the purposes of 2.3, is okay enough (2.4 should remove STL usage entirely)); it's just that the initial act of iterating over the levels directory no longer takes four or SIX(!!!) heap allocations (not counting reallocations and other heap allocations this patch does not remove), and no longer does any data marshalling. Like text splitting, and binary blob extra indice grabbing, the current approach that FILESYSTEM_getLevelDirFileNames() uses is a temporary std::vector of std::strings as a middleman to store all the filenames, and the game iterates over that std::vector to grab each level metadata. Except, it's even worse in this case, because PHYSFS_enumerateFiles() ALREADY does a heap allocation. Oh, and FILESYSTEM_getLevelDirFileNames() gets called two or three times. Yeah, let me explain: 1. FILESYSTEM_getLevelDirFileNames() calls PHYSFS_enumerateFiles(). 2. PHYSFS_enumerateFiles() allocates an array of pointers to arrays of chars on the heap. For each filename, it will: a. Allocate an array of chars for the filename. b. Reallocate the array of pointers to add the pointer to the above char array. (In this step, it also inserts the filename in alphabetically - without any further allocations, as far as I know - but this is a COMPLETELY unnecessary step, because we are going to sort the list of levels by ourselves via the metadata title in the end anyways.) 3. FILESYSTEM_getLevelDirFileNames() iterates over the PhysFS list, and allocates an std::vector on the heap to shove the list into. Then, for each filename, it will: a. Allocate an std::string, initialized to "levels/". b. Append the filename to the std::string above. This will most likely require a re-allocation. c. Duplicate the std::string - which requires allocating more memory again - to put it into the std::vector. (Compared to the PhysFS list above, the std::vector does less reallocations; it however will still end up reallocating a certain amount of times in the end.) 4. FILESYSTEM_getLevelDirFileNames() will free the PhysFS list. 5. Then to get the std::vector<std::string> back to the caller, we end up having to reallocate the std::vector again - reallocating every single std::string inside it, too - to give it back to the caller. And to top it all off, FILESYSTEM_getLevelDirFileNames() is guaranteed to either be called two times, or three times. This is because editorclass::getDirectoryData() will call editorclass::loadZips(), which will unconditionally call FILESYSTEM_getLevelDirFileNames(), then call it AGAIN if a zip was found. Then once the function returns, getDirectoryData() will still unconditionally call FILESYSTEM_getLevelDirFileNames(). This smells like someone bolting something on without regard for the whole picture of the system, but whatever; I can clean up their mess just fine. So, what do I do about this? Well, just like I did with text splitting and binary blob extras, make the final for-loop - the one that does the actual metadata parsing - more immediate. So how do I do that? Well, PhysFS has a function named PHYSFS_enumerate(). PHYSFS_enumerateFiles(), in fact, uses this function internally, and is basically just a wrapper with some allocation and alphabetization. PHYSFS_enumerate() takes in a pointer to a function, which it will call for every single entry that it iterates over. It also lets you pass in another arbitrary pointer that it leaves alone, which I use to pass through a function pointer that is the actual callback. So to clarify, there are two callbacks - one callback is passed through into another callback that gets passed through to PHYSFS_enumerate(). The callback that gets passed to PHYSFS_enumerate() is always the same, but the callback that gets passed through the callback can be different (if you look at the calling code, you can see that one caller passes through a normal level metadata callback; the other passes through a zip file callback). Furthermore, I've also cleaned it up so that if editorclass::loadZips() finds a zip file, it won't iterate over all the files in the levels directory a third time. Instead, the level directory only gets iterated over twice - once to check for zips, and another to load every level plus all zips; the second time is when all the heap allocations happen. And with that, level list loading now uses less STL templated stuff and much less heap allocations. Also, ed.directoryList basically has no reason to exist other than being a temporary std::vector, so I've removed it. This further decreases memory usage, depending on how many levels you have in your levels folder (I know that I usually have a lot and don't really ever clean it up, lol). Lastly, in the callback passed to PhysFS, `builtLocation` is actually no longer hardcoded to just the `levels` directory, since instead we now use the `origdir` variable that PhysFS passes us. So that's good, too.
2021-02-19 03:42:13 +01:00
if (ed.getLevelMetaData(filename_, temp))
{
ed.ListOfMetaData.push_back(temp);
}
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::getDirectoryData(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ListOfMetaData.clear();
Fixed some custom asset bugs, added .zip level loading Main game would retain custom level assets, now fixed. Also, custom fonts load properly. Finally, levels can be stored as a zip and placed in the levels folder, with the .vvvvvv file at the root of the zip and custom asset folders (graphics, sounds etc) also at the root.
2020-06-03 20:05:09 +02:00
loadZips();
Refactor level dir listing to not use STL data marshalling Note that level dir listing still uses plenty of STL (including the end product - the `LevelMetaData` struct - which, for the purposes of 2.3, is okay enough (2.4 should remove STL usage entirely)); it's just that the initial act of iterating over the levels directory no longer takes four or SIX(!!!) heap allocations (not counting reallocations and other heap allocations this patch does not remove), and no longer does any data marshalling. Like text splitting, and binary blob extra indice grabbing, the current approach that FILESYSTEM_getLevelDirFileNames() uses is a temporary std::vector of std::strings as a middleman to store all the filenames, and the game iterates over that std::vector to grab each level metadata. Except, it's even worse in this case, because PHYSFS_enumerateFiles() ALREADY does a heap allocation. Oh, and FILESYSTEM_getLevelDirFileNames() gets called two or three times. Yeah, let me explain: 1. FILESYSTEM_getLevelDirFileNames() calls PHYSFS_enumerateFiles(). 2. PHYSFS_enumerateFiles() allocates an array of pointers to arrays of chars on the heap. For each filename, it will: a. Allocate an array of chars for the filename. b. Reallocate the array of pointers to add the pointer to the above char array. (In this step, it also inserts the filename in alphabetically - without any further allocations, as far as I know - but this is a COMPLETELY unnecessary step, because we are going to sort the list of levels by ourselves via the metadata title in the end anyways.) 3. FILESYSTEM_getLevelDirFileNames() iterates over the PhysFS list, and allocates an std::vector on the heap to shove the list into. Then, for each filename, it will: a. Allocate an std::string, initialized to "levels/". b. Append the filename to the std::string above. This will most likely require a re-allocation. c. Duplicate the std::string - which requires allocating more memory again - to put it into the std::vector. (Compared to the PhysFS list above, the std::vector does less reallocations; it however will still end up reallocating a certain amount of times in the end.) 4. FILESYSTEM_getLevelDirFileNames() will free the PhysFS list. 5. Then to get the std::vector<std::string> back to the caller, we end up having to reallocate the std::vector again - reallocating every single std::string inside it, too - to give it back to the caller. And to top it all off, FILESYSTEM_getLevelDirFileNames() is guaranteed to either be called two times, or three times. This is because editorclass::getDirectoryData() will call editorclass::loadZips(), which will unconditionally call FILESYSTEM_getLevelDirFileNames(), then call it AGAIN if a zip was found. Then once the function returns, getDirectoryData() will still unconditionally call FILESYSTEM_getLevelDirFileNames(). This smells like someone bolting something on without regard for the whole picture of the system, but whatever; I can clean up their mess just fine. So, what do I do about this? Well, just like I did with text splitting and binary blob extras, make the final for-loop - the one that does the actual metadata parsing - more immediate. So how do I do that? Well, PhysFS has a function named PHYSFS_enumerate(). PHYSFS_enumerateFiles(), in fact, uses this function internally, and is basically just a wrapper with some allocation and alphabetization. PHYSFS_enumerate() takes in a pointer to a function, which it will call for every single entry that it iterates over. It also lets you pass in another arbitrary pointer that it leaves alone, which I use to pass through a function pointer that is the actual callback. So to clarify, there are two callbacks - one callback is passed through into another callback that gets passed through to PHYSFS_enumerate(). The callback that gets passed to PHYSFS_enumerate() is always the same, but the callback that gets passed through the callback can be different (if you look at the calling code, you can see that one caller passes through a normal level metadata callback; the other passes through a zip file callback). Furthermore, I've also cleaned it up so that if editorclass::loadZips() finds a zip file, it won't iterate over all the files in the levels directory a third time. Instead, the level directory only gets iterated over twice - once to check for zips, and another to load every level plus all zips; the second time is when all the heap allocations happen. And with that, level list loading now uses less STL templated stuff and much less heap allocations. Also, ed.directoryList basically has no reason to exist other than being a temporary std::vector, so I've removed it. This further decreases memory usage, depending on how many levels you have in your levels folder (I know that I usually have a lot and don't really ever clean it up, lol). Lastly, in the callback passed to PhysFS, `builtLocation` is actually no longer hardcoded to just the `levels` directory, since instead we now use the `origdir` variable that PhysFS passes us. So that's good, too.
2021-02-19 03:42:13 +01:00
FILESYSTEM_enumerateLevelDirFileNames(levelMetaDataCallback);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for(size_t i = 0; i < ListOfMetaData.size(); i++)
{
for(size_t k = 0; k < ListOfMetaData.size(); k++)
{
if(compare_nocase(ListOfMetaData[i].title, ListOfMetaData[k].title ))
{
std::swap(ListOfMetaData[i] , ListOfMetaData[k]);
}
}
}
}
bool editorclass::getLevelMetaData(std::string& _path, LevelMetaData& _data )
{
Optimize editorclass::getLevelMetaData() Now whenever it looks at a level file, it NOT parse the entire XML document, which is a huge slowdown. Loading levels should be really quick now.
2020-04-18 00:31:02 +02:00
unsigned char *uMem = NULL;
FILESYSTEM_loadFileToMemory(_path.c_str(), &uMem, NULL, true);
if (uMem == NULL)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
printf("Level %s not found :(\n", _path.c_str());
return false;
}
Optimize editorclass::getLevelMetaData() Now whenever it looks at a level file, it NOT parse the entire XML document, which is a huge slowdown. Loading levels should be really quick now.
2020-04-18 00:31:02 +02:00
std::string buf((char*) uMem);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Free loaded file in editorclass::getLevelMetadata() This fixes memory leaking every single time a file gets loaded(!) when the list of custom levels gets loaded(!!!), which Valgrind reports. This memory leak is completely my bad; 2.2 properly frees the loaded file, and VCE uses an std::unique_ptr - which I decided to ignore and not think about why it would be there. It's safe to do this free after uMem gets copied into std::string; although, in the future, I *am* thinking about refactoring this function (and the tag finder function) to not use std::strings, and I'll have to be careful to make sure that the memory management with the file is correct when I do so.
2021-02-16 04:11:51 +01:00
FILESYSTEM_freeMemory(&uMem);
Optimize editorclass::getLevelMetaData() Now whenever it looks at a level file, it NOT parse the entire XML document, which is a huge slowdown. Loading levels should be really quick now.
2020-04-18 00:31:02 +02:00
if (find_metadata(buf) == "")
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Optimize editorclass::getLevelMetaData() Now whenever it looks at a level file, it NOT parse the entire XML document, which is a huge slowdown. Loading levels should be really quick now.
2020-04-18 00:31:02 +02:00
printf("Couldn't load metadata for %s\n", _path.c_str());
return false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Optimize editorclass::getLevelMetaData() Now whenever it looks at a level file, it NOT parse the entire XML document, which is a huge slowdown. Loading levels should be really quick now.
2020-04-18 00:31:02 +02:00
_data.creator = find_creator(buf);
_data.title = find_title(buf);
_data.Desc1 = find_desc1(buf);
_data.Desc2 = find_desc2(buf);
_data.Desc3 = find_desc3(buf);
Fix a copy-paste error in getLevelMetaData() Whoops.
2020-05-08 05:55:26 +02:00
_data.website = find_website(buf);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Optimize editorclass::getLevelMetaData() Now whenever it looks at a level file, it NOT parse the entire XML document, which is a huge slowdown. Loading levels should be really quick now.
2020-04-18 00:31:02 +02:00
_data.filename = _path;
return true;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::reset(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
version=2; //New smaller format change is 2
mapwidth=5;
mapheight=5;
EditorData::GetInstance().title="Untitled Level";
EditorData::GetInstance().creator="Unknown";
Desc1="";
Desc2="";
Desc3="";
website="";
roomnamehide=0;
zmod=false;
xmod=false;
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
cmod=false;
vmod=false;
hmod=false;
bmod=false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
spacemod=false;
spacemenu=0;
shiftmenu=false;
shiftkey=false;
saveandquit=false;
note="";
notedelay=0;
Smoothly interpolate editor notedelay This makes editor notes fade out smoothly. And even though the notedelay only gets decremented by one every editor-frame (the editor runs at 1000/24 FPS fixed-timestep here), it actually gets multiplied by 4, so a floating-point interpolated value would make a difference here.
2020-05-02 19:42:39 +02:00
oldnotedelay=0;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
deletekeyheld=false;
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
textmod = TEXT_NONE;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
titlemod=false;
creatormod=false;
desc1mod=false;
desc2mod=false;
desc3mod=false;
websitemod=false;
settingsmod=false;
warpmod=false; //Two step process
warpent=-1;
boundarymod=0;
boundarytype=0;
boundx1=0;
boundx2=0;
boundy1=0;
boundy2=0;
Fix and improve handling of cancelling roomtext/scripttext input First, two bug fixes. Room text input mode wasn't properly unset upon pressing Esc, making the prompt get stuck, requiring you to add roomtext again and finish it to make it go away. Secondly, escaping script text input would remove the wrong entity. I also tweaked the handling slightly so that instead of deleting the entity if it already existed if escaping from text input, it merely reverts the change in script name/roomtext to what it was previously. I considered refactoring the editor text input handler entirely, but figured such a change would be a bit too extensive for the purpose of this repository.
2020-01-27 11:15:25 +01:00
textent=0;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
scripttexttype=0;
drawmode=0;
dmtile=0;
dmtileeditor=0;
entcol=0;
tilex=0;
tiley=0;
levx=0;
levy=0;
keydelay=0;
lclickdelay=0;
savekey=false;
loadkey=false;
updatetiles=true;
changeroom=true;
levmusic=0;
entframe=0;
entframedelay=0;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
edentity.clear();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
levmusic=0;
for (int j = 0; j < maxheight; j++)
{
for (int i = 0; i < maxwidth; i++)
{
level[i+(j*maxwidth)].tileset=0;
level[i+(j*maxwidth)].tilecol=(i+j)%32;
level[i+(j*maxwidth)].roomname="";
level[i+(j*maxwidth)].warpdir=0;
level[i+(j*maxwidth)].platx1=0;
level[i+(j*maxwidth)].platy1=0;
level[i+(j*maxwidth)].platx2=320;
level[i+(j*maxwidth)].platy2=240;
level[i+(j*maxwidth)].platv=4;
level[i+(j*maxwidth)].enemyx1=0;
level[i+(j*maxwidth)].enemyy1=0;
level[i+(j*maxwidth)].enemyx2=320;
level[i+(j*maxwidth)].enemyy2=240;
Reset enemy type in editorclass::reset() This fixes a bug where if you loaded a level, then started making a new level in the editor, the enemy types from the previous level would persist. While working on VVVVVV: Community Edition and adding a new room property for enemy speed, I noticed that enemy type was not getting reset at all. After some testing, I confirmed that this was the case. So this bug is fixed now.
2020-01-23 10:26:29 +01:00
level[i+(j*maxwidth)].enemytype=0;
Reset Direct Mode in editorclass::reset() There's a long-standing issue where the Direct Mode status of the loaded custom map in memory never resets properly. So if you load a level with a certain layout of Direct Mode rooms, that same layout will be preserved if you start making a new level in the editor. This commit fixes that issue.
2020-01-20 06:46:52 +01:00
level[i+(j*maxwidth)].directmode=0;
Reset warp directions when exiting playtesting This fixes a bug where if warpdir() was used during in-editor playtesting, the changed warp direction would persist even when leaving playtesting. This would be very annoying to correct back every time you playtested and warpdir() was used, so I've added some kludge to store the actual warp direction of each room when entering playtesting, and then set the warp directions back when leaving playtesting.
2020-01-31 04:06:16 +01:00
kludgewarpdir[i+(j*maxwidth)]=0;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Clean up resetting editor contents and scripts Contents and scripts should be reset in editorclass::reset(); there's no reason to reset them again right before you load them from an XML file in editorclass::load(). Additionally, the resets now consistently use SDL_zeroa() (for contents) and scriptclass::clearcustom() (for scripts).
2021-02-13 01:35:22 +01:00
SDL_zeroa(contents);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
hooklist.clear();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
sb.clear();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
clearscriptbuffer();
sbx=0;
sby=0;
pagey=0;
scripteditmod=false;
sbscript="null";
scripthelppage=0;
scripthelppagedelay=0;
hookmenupage=0;
hookmenu=0;
Clean up resetting editor contents and scripts Contents and scripts should be reset in editorclass::reset(); there's no reason to reset them again right before you load them from an XML file in editorclass::load(). Additionally, the resets now consistently use SDL_zeroa() (for contents) and scriptclass::clearcustom() (for scripts).
2021-02-13 01:35:22 +01:00
script.clearcustom();
Support pre-C++11 compilers
2020-02-11 06:34:01 +01:00
returneditoralpha = 0;
Smoothly interpolate "[Press ENTER to return to editor]" fadeout Now it'll be real smooth at 60 FPS. Or above. Or whichever one you want above 30.
2020-05-02 19:49:41 +02:00
oldreturneditoralpha = 0;
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
ghosts.clear();
Remove another header initialization
2020-06-13 00:27:21 +02:00
currentghosts = 0;
Add being able to override the one-way recolor Disabling the one-way recolor if assets are mounted is needed to make existing levels not look bad, but what about levels that want to use the recolor anyway? The best solution here is to just introduce another bool into the XML, and make the re-color opt-in and only present if assets are mounted if that tag is present.
2020-06-30 23:08:14 +02:00
onewaycol_override = false;
Remember loaded custom level and read from it when saving My previous custom level forwards compatibility would only work if you saved to the same filename as you read from. But what if you saved to a new filename? Well, your extra XML is lost. Not to worry, I've introduced a variable that remembers the filepath of the currently-loaded level (the existing `filename` attribute is kind of weird and not really suited for this purpose, so). I tried to make it a simple `const char*`, but it turns out that's bad when you take the `c_str()` of an `std::string` that then gets destroyed, so it's best to use `std::string` in an `std::string` world. So now when you save a level, it'll attempt to open the original file, and if that doesn't exist then your extra XML gets lost anyway, but I shouldn't be expected to keep your XML if you delete the original file.
2020-11-03 18:55:26 +01:00
loaded_filepath = "";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::gethooks(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Scan through the script and create a hooks list based on it
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
hooklist.clear();
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
for (size_t i = 0; i < script.customscripts.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Script& script_ = script.customscripts[i];
hooklist.push_back(script_.name);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
void editorclass::loadhookineditor(std::string t)
{
//Find hook t in the scriptclass, then load it into the editor
clearscriptbuffer();
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
for(size_t i = 0; i < script.customscripts.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Script& script_ = script.customscripts[i];
if(script_.name == t)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
sb = script_.contents;
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(sb.empty())
{
//Always have one line or we'll have problems
sb.resize(1);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void editorclass::addhooktoscript(std::string t)
{
//Adds hook+the scriptbuffer to the end of the scriptclass
removehookfromscript(t);
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Script script_;
script_.name = t;
script_.contents = sb;
script.customscripts.push_back(script_);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void editorclass::removehookfromscript(std::string t)
{
//Find hook t in the scriptclass, then removes it (and any other code with it)
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
for (size_t i = 0; i < script.customscripts.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Script& script_ = script.customscripts[i];
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
if (script_.name == t)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
script.customscripts.erase(script.customscripts.begin() + i);
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
void editorclass::removehook(std::string t)
{
//Check the hooklist for the hook t. If it's there, remove it from here and the script
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
removehookfromscript(t);
hooklist.erase(std::remove(hooklist.begin(), hooklist.end(), t), hooklist.end());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void editorclass::addhook(std::string t)
{
//Add an empty function to the list in both editor and script
removehook(t);
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
hooklist.push_back(t);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
addhooktoscript(t);
}
bool editorclass::checkhook(std::string t)
{
//returns true if hook t already is in the list
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
for(size_t i=0; i<hooklist.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(hooklist[i]==t) return true;
}
return false;
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::clearscriptbuffer(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
sb.clear();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
void editorclass::removeline(int t)
{
//Remove line t from the script
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if((int)sb.size()>1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
sb.erase(sb.begin() + t);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
void editorclass::insertline(int t)
{
//insert a blank line into script at line t
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
sb.insert(sb.begin() + t, "");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
void editorclass::getlin(const enum textmode mode, const std::string& prompt, std::string* ptr)
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
textmod = mode;
textptr = ptr;
textdesc = prompt;
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
key.enabletextentry();
if (ptr)
{
key.keybuffer = *ptr;
}
else
{
key.keybuffer = "";
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
textptr = &(key.keybuffer);
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
}
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
oldenttext = key.keybuffer;
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
}
Change all tilemaps to be short[1200] instead of int[1200] This removes around megabyte from the binary, so a stripped -Og binary went from 4.0 megabytes to 2.9 megabytes, and an unstripped -O0 binary went from 8.1 megabytes to 7.1 megabytes, which means I can now finally upload an unstripped -O0 binary to Discord without having to give money to Discord for their dumb Nitro thing or whatever.
2020-07-19 06:06:35 +02:00
const short* editorclass::loadlevel( int rxi, int ryi )
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Set up our buffer array to be picked up by mapclass
rxi -= 100;
ryi -= 100;
if(rxi<0)rxi+=mapwidth;
if(ryi<0)ryi+=mapheight;
if(rxi>=mapwidth)rxi-=mapwidth;
if(ryi>=mapheight)ryi-=mapheight;
Change all tilemaps to be short[1200] instead of int[1200] This removes around megabyte from the binary, so a stripped -Og binary went from 4.0 megabytes to 2.9 megabytes, and an unstripped -O0 binary went from 8.1 megabytes to 7.1 megabytes, which means I can now finally upload an unstripped -O0 binary to Discord without having to give money to Discord for their dumb Nitro thing or whatever.
2020-07-19 06:06:35 +02:00
static short result[1200];
Remove unnecessary middleman ed.swapmap When the game loads a room in a custom level, previously it would load the tilemap of that room into ed.swapmap, and then mapclass::loadlevel() would manually go through each element in ed.swapmap to set each tile in `contents`. Why do that, when you can just return the vector from editorclass::loadlevel() and set it directly? ed.swapmap is really unnecessary.
2020-05-22 04:23:21 +02:00
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for (int j = 0; j < 30; j++)
{
for (int i = 0; i < 40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
result[i + j*40] = gettile(rxi, ryi, i, j);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Remove unnecessary middleman ed.swapmap When the game loads a room in a custom level, previously it would load the tilemap of that room into ed.swapmap, and then mapclass::loadlevel() would manually go through each element in ed.swapmap to set each tile in `contents`. Why do that, when you can just return the vector from editorclass::loadlevel() and set it directly? ed.swapmap is really unnecessary.
2020-05-22 04:23:21 +02:00
return result;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
int editorclass::getlevelcol(const int tileset, const int tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(tileset==0) //Space Station
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return tilecol;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(tileset==1) //Outside
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 32+tilecol;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(tileset==2) //Lab
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 40+tilecol;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(tileset==3) //Warp Zone
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 46+tilecol;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(tileset==4) //Ship
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 52+tilecol;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
return 0;
}
int editorclass::getenemycol(int t)
{
switch(t)
{
//RED
case 3:
case 7:
case 12:
case 23:
case 28:
case 34:
case 42:
case 48:
case 58:
return 6;
break;
//GREEN
case 5:
case 9:
case 22:
case 25:
case 29:
case 31:
case 38:
case 46:
case 52:
case 53:
return 7;
break;
//BLUE
case 1:
case 6:
case 14:
case 27:
case 33:
case 44:
case 50:
case 57:
return 12;
break;
//YELLOW
case 4:
case 17:
case 24:
case 30:
case 37:
case 45:
case 51:
case 55:
return 9;
break;
//PURPLE
case 2:
case 11:
case 15:
case 19:
case 32:
case 36:
case 49:
return 20;
break;
//CYAN
case 8:
case 10:
case 13:
case 18:
case 26:
case 35:
case 41:
case 47:
case 54:
return 11;
break;
//PINK
case 16:
case 20:
case 39:
case 43:
case 56:
return 8;
break;
//ORANGE
case 21:
case 40:
return 17;
break;
default:
return 6;
break;
}
}
int editorclass::getwarpbackground(int rx, int ry)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = getroomprop(rx, ry);
switch(room->tileset)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0: //Space Station
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0:
return 3;
break;
case 1:
return 2;
break;
case 2:
return 1;
break;
case 3:
return 4;
break;
case 4:
return 5;
break;
case 5:
return 3;
break;
case 6:
return 1;
break;
case 7:
return 0;
break;
case 8:
return 5;
break;
case 9:
return 0;
break;
case 10:
return 2;
break;
case 11:
return 1;
break;
case 12:
return 5;
break;
case 13:
return 0;
break;
case 14:
return 3;
break;
case 15:
return 2;
break;
case 16:
return 4;
break;
case 17:
return 0;
break;
case 18:
return 3;
break;
case 19:
return 1;
break;
case 20:
return 4;
break;
case 21:
return 5;
break;
case 22:
return 1;
break;
case 23:
return 4;
break;
case 24:
return 5;
break;
case 25:
return 0;
break;
case 26:
return 3;
break;
case 27:
return 1;
break;
case 28:
return 5;
break;
case 29:
return 4;
break;
case 30:
return 5;
break;
case 31:
return 2;
break;
default:
return 6;
break;
}
break;
case 1: //Outside
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0:
return 3;
break;
case 1:
return 1;
break;
case 2:
return 0;
break;
case 3:
return 2;
break;
case 4:
return 4;
break;
case 5:
return 5;
break;
case 6:
return 2;
break;
case 7:
return 4;
break;
default:
return 6;
break;
}
break;
case 2: //Lab
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0:
return 0;
break;
case 1:
return 1;
break;
case 2:
return 2;
break;
case 3:
return 3;
break;
case 4:
return 4;
break;
case 5:
return 5;
break;
case 6:
return 6;
break;
default:
return 6;
break;
}
break;
case 3: //Warp Zone
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0:
return 0;
break;
case 1:
return 1;
break;
case 2:
return 2;
break;
case 3:
return 3;
break;
case 4:
return 4;
break;
case 5:
return 5;
break;
case 6:
return 6;
break;
default:
return 6;
break;
}
break;
case 4: //Ship
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0:
return 5;
break;
case 1:
return 0;
break;
case 2:
return 4;
break;
case 3:
return 2;
break;
case 4:
return 3;
break;
case 5:
return 1;
break;
case 6:
return 6;
break;
default:
return 6;
break;
}
break;
case 5: //Tower
return 6;
break;
default:
return 6;
break;
}
}
int editorclass::getenemyframe(int t)
{
switch(t)
{
case 0:
return 78;
break;
case 1:
return 88;
break;
case 2:
return 36;
break;
case 3:
return 164;
break;
case 4:
return 68;
break;
case 5:
return 48;
break;
case 6:
return 176;
break;
case 7:
return 168;
break;
case 8:
return 112;
break;
case 9:
return 114;
break;
default:
return 78;
break;
}
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
int editorclass::gettileidx(
const int rx,
const int ry,
const int x,
const int y
) {
const int yoff = y + ry*30;
int mult;
int idx;
Add bounds checks to tile setter and getters This removes all traces of Undefined Behavior from getting and placing tiles. This mimics the previous behavior (2.2 and below) as reasonably as possible. `vmult` was previously a vector, there was a bunch of unused space directly after the end of the usable space of the vector, which was all filled with zeroes. The same goes for `contents`, having previously been a vector, and so having a bunch of zeroes immediately following the end of the in-bounds space. That's why both are 0 if you index them out of bounds.
2021-03-24 19:51:39 +01:00
if (INBOUNDS_ARR(yoff, vmult))
{
mult = vmult[yoff];
}
else
{
mult = 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
idx = x + rx*40 + mult;
return idx;
}
void editorclass::settile(
const int rx,
const int ry,
const int x,
const int y,
const int t
) {
const int idx = gettileidx(rx, ry, x, y);
Add bounds checks to tile setter and getters This removes all traces of Undefined Behavior from getting and placing tiles. This mimics the previous behavior (2.2 and below) as reasonably as possible. `vmult` was previously a vector, there was a bunch of unused space directly after the end of the usable space of the vector, which was all filled with zeroes. The same goes for `contents`, having previously been a vector, and so having a bunch of zeroes immediately following the end of the in-bounds space. That's why both are 0 if you index them out of bounds.
2021-03-24 19:51:39 +01:00
if (!INBOUNDS_ARR(idx, contents))
{
return;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
contents[idx] = t;
}
int editorclass::gettile(
const int rx,
const int ry,
const int x,
const int y
) {
const int idx = gettileidx(rx, ry, x, y);
Add bounds checks to tile setter and getters This removes all traces of Undefined Behavior from getting and placing tiles. This mimics the previous behavior (2.2 and below) as reasonably as possible. `vmult` was previously a vector, there was a bunch of unused space directly after the end of the usable space of the vector, which was all filled with zeroes. The same goes for `contents`, having previously been a vector, and so having a bunch of zeroes immediately following the end of the in-bounds space. That's why both are 0 if you index them out of bounds.
2021-03-24 19:51:39 +01:00
if (!INBOUNDS_ARR(idx, contents))
{
return 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
return contents[idx];
}
int editorclass::getabstile(const int x, const int y)
{
int idx;
int yoff;
Add bounds checks to tile setter and getters This removes all traces of Undefined Behavior from getting and placing tiles. This mimics the previous behavior (2.2 and below) as reasonably as possible. `vmult` was previously a vector, there was a bunch of unused space directly after the end of the usable space of the vector, which was all filled with zeroes. The same goes for `contents`, having previously been a vector, and so having a bunch of zeroes immediately following the end of the in-bounds space. That's why both are 0 if you index them out of bounds.
2021-03-24 19:51:39 +01:00
if (INBOUNDS_ARR(y, vmult))
{
yoff = vmult[y];
}
else
{
yoff = 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
idx = x + yoff;
Add bounds checks to tile setter and getters This removes all traces of Undefined Behavior from getting and placing tiles. This mimics the previous behavior (2.2 and below) as reasonably as possible. `vmult` was previously a vector, there was a bunch of unused space directly after the end of the usable space of the vector, which was all filled with zeroes. The same goes for `contents`, having previously been a vector, and so having a bunch of zeroes immediately following the end of the in-bounds space. That's why both are 0 if you index them out of bounds.
2021-03-24 19:51:39 +01:00
if (!INBOUNDS_ARR(idx, contents))
{
return 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
return contents[idx];
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
int editorclass::getroompropidx(const int rx, const int ry)
{
return rx + ry*maxwidth;
}
const edlevelclass* editorclass::getroomprop(const int rx, const int ry)
{
const int idx = getroompropidx(rx, ry);
return &level[idx];
}
#define FOREACH_PROP(NAME, TYPE) \
void editorclass::setroom##NAME(const int rx, const int ry, const TYPE NAME) \
{ \
const int idx = getroompropidx(rx, ry); \
\
level[idx].NAME = NAME; \
}
ROOM_PROPERTIES
#undef FOREACH_PROP
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
void editorclass::placetilelocal( int x, int y, int t )
{
if(x>=0 && y>=0 && x<40 && y<30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
settile(levx, levy, x, y, t);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
updatetiles=true;
}
int editorclass::base( int x, int y )
{
//Return the base tile for the given tileset and colour
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = getroomprop(x, y);
if(room->tileset==0) //Space Station
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->tilecol>=22)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 483 + ((room->tilecol-22)*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tilecol>=11)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 283 + ((room->tilecol-11)*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 83 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==1) //Outside
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 480 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==2) //Lab
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 280 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==3) //Warp Zone/Intermission
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 80 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==4) //SHIP
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 101 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
return 0;
}
int editorclass::backbase( int x, int y )
{
//Return the base tile for the background of the given tileset and colour
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = getroomprop(x, y);
if(room->tileset==0) //Space Station
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Pick depending on tilecol
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->tilecol)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0:
case 5:
case 26:
return 680; //Blue
break;
case 3:
case 16:
case 23:
return 683; //Yellow
break;
case 9:
case 12:
case 21:
return 686; //Greeny Cyan
break;
case 4:
case 8:
case 24:
case 28:
case 30:
return 689; //Green
break;
case 20:
case 29:
return 692; //Orange
break;
case 2:
case 6:
case 11:
case 22:
case 27:
return 695; //Red
break;
case 1:
case 10:
case 15:
case 19:
case 31:
return 698; //Pink
break;
case 14:
case 18:
return 701; //Dark Blue
break;
case 7:
case 13:
case 17:
case 25:
return 704; //Cyan
break;
default:
return 680;
break;
}
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==1) //outside
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 680 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==2) //Lab
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==3) //Warp Zone/Intermission
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 120 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(room->tileset==4) //SHIP
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
return 741 + (room->tilecol*3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
return 0;
}
int editorclass::at( int x, int y )
{
if(x<0) return at(0,y);
if(y<0) return at(x,0);
if(x>=40) return at(39,y);
if(y>=30) return at(x,29);
if(x>=0 && y>=0 && x<40 && y<30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
return gettile(levx, levy, x, y);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
return 0;
}
int editorclass::freewrap( int x, int y )
{
if(x<0) return freewrap(x+(mapwidth*40),y);
if(y<0) return freewrap(x,y+(mapheight*30));
if(x>=(mapwidth*40)) return freewrap(x-(mapwidth*40),y);
if(y>=(mapheight*30)) return freewrap(x,y-(mapheight*30));
if(x>=0 && y>=0 && x<(mapwidth*40) && y<(mapheight*30))
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(getabstile(x, y)==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
else
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(getabstile(x, y)>=2 && getabstile(x, y)<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(getabstile(x, y)>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
}
}
return 1;
}
int editorclass::backonlyfree( int x, int y )
{
//Returns 1 if tile is a background tile, 0 otherwise
if(x<0) return backonlyfree(0,y);
if(y<0) return backonlyfree(x,0);
if(x>=40) return backonlyfree(39,y);
if(y>=30) return backonlyfree(x,29);
if(x>=0 && y>=0 && x<40 && y<30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 1;
}
}
return 0;
}
int editorclass::backfree( int x, int y )
{
//Returns 0 if tile is not a block or background tile, 1 otherwise
if(x<0) return backfree(0,y);
if(y<0) return backfree(x,0);
if(x>=40) return backfree(39,y);
if(y>=30) return backfree(x,29);
if(x>=0 && y>=0 && x<40 && y<30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
}
return 1;
}
int editorclass::spikefree( int x, int y )
{
//Returns 0 if tile is not a block or spike, 1 otherwise
if(x==-1) return free(0,y);
if(y==-1) return free(x,0);
if(x==40) return free(39,y);
if(y==30) return free(x,29);
if(x>=0 && y>=0 && x<40 && y<30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
else
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
}
}
return 1;
}
int editorclass::free( int x, int y )
{
//Returns 0 if tile is not a block, 1 otherwise
if(x==-1) return free(0,y);
if(y==-1) return free(x,0);
if(x==40) return free(39,y);
if(y==30) return free(x,29);
if(x>=0 && y>=0 && x<40 && y<30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
else
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)>=2 && gettile(levx, levy, x, y)<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(gettile(levx, levy, x, y)>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
}
}
return 1;
}
int editorclass::absfree( int x, int y )
{
//Returns 0 if tile is not a block, 1 otherwise, abs on grid
if(x>=0 && y>=0 && x<mapwidth*40 && y<mapheight*30)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(getabstile(x, y)==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
else
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(getabstile(x, y)>=2 && getabstile(x, y)<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
if(getabstile(x, y)>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
return 0;
}
}
}
return 1;
}
int editorclass::match( int x, int y )
{
if(free(x-1,y)==0 && free(x,y-1)==0 && free(x+1,y)==0 && free(x,y+1)==0) return 0;
if(free(x-1,y)==0 && free(x,y-1)==0) return 10;
if(free(x+1,y)==0 && free(x,y-1)==0) return 11;
if(free(x-1,y)==0 && free(x,y+1)==0) return 12;
if(free(x+1,y)==0 && free(x,y+1)==0) return 13;
if(free(x,y-1)==0) return 1;
if(free(x-1,y)==0) return 2;
if(free(x,y+1)==0) return 3;
if(free(x+1,y)==0) return 4;
if(free(x-1,y-1)==0) return 5;
if(free(x+1,y-1)==0) return 6;
if(free(x-1,y+1)==0) return 7;
if(free(x+1,y+1)==0) return 8;
return 0;
}
int editorclass::outsidematch( int x, int y )
{
if(backonlyfree(x-1,y)==0 && backonlyfree(x+1,y)==0) return 2;
if(backonlyfree(x,y-1)==0 && backonlyfree(x,y+1)==0) return 1;
return 0;
}
int editorclass::backmatch( int x, int y )
{
//Returns the first position match for a border
// 5 1 6
// 2 X 4
// 7 3 8
if(backfree(x-1,y)==0 && backfree(x,y-1)==0 && backfree(x+1,y)==0 && backfree(x,y+1)==0) return 0;
if(backfree(x-1,y)==0 && backfree(x,y-1)==0) return 10;
if(backfree(x+1,y)==0 && backfree(x,y-1)==0) return 11;
if(backfree(x-1,y)==0 && backfree(x,y+1)==0) return 12;
if(backfree(x+1,y)==0 && backfree(x,y+1)==0) return 13;
if(backfree(x,y-1)==0) return 1;
if(backfree(x-1,y)==0) return 2;
if(backfree(x,y+1)==0) return 3;
if(backfree(x+1,y)==0) return 4;
if(backfree(x-1,y-1)==0) return 5;
if(backfree(x+1,y-1)==0) return 6;
if(backfree(x-1,y+1)==0) return 7;
if(backfree(x+1,y+1)==0) return 8;
return 0;
}
int editorclass::edgetile( int x, int y )
{
switch(match(x,y))
{
case 14:
return 0;
break;
case 10:
return 80;
break;
case 11:
return 82;
break;
case 12:
return 160;
break;
case 13:
return 162;
break;
case 1:
return 81;
break;
case 2:
return 120;
break;
case 3:
return 161;
break;
case 4:
return 122;
break;
case 5:
return 42;
break;
case 6:
return 41;
break;
case 7:
return 2;
break;
case 8:
return 1;
break;
case 0:
default:
return 0;
break;
}
}
int editorclass::outsideedgetile( int x, int y )
{
switch(outsidematch(x,y))
{
case 2:
return 0;
break;
case 1:
return 1;
break;
case 0:
default:
return 2;
break;
}
}
int editorclass::backedgetile( int x, int y )
{
switch(backmatch(x,y))
{
case 14:
return 0;
break;
case 10:
return 80;
break;
case 11:
return 82;
break;
case 12:
return 160;
break;
case 13:
return 162;
break;
case 1:
return 81;
break;
case 2:
return 120;
break;
case 3:
return 161;
break;
case 4:
return 122;
break;
case 5:
return 42;
break;
case 6:
return 41;
break;
case 7:
return 2;
break;
case 8:
return 1;
break;
case 0:
default:
return 0;
break;
}
}
int editorclass::labspikedir( int x, int y, int t )
{
// a slightly more tricky case
if(free(x,y+1)==1) return 63 + (t*2);
if(free(x,y-1)==1) return 64 + (t*2);
if(free(x-1,y)==1) return 51 + (t*2);
if(free(x+1,y)==1) return 52 + (t*2);
return 63 + (t*2);
}
int editorclass::spikedir( int x, int y )
{
if(free(x,y+1)==1) return 8;
if(free(x,y-1)==1) return 9;
if(free(x-1,y)==1) return 49;
if(free(x+1,y)==1) return 50;
return 8;
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::findstartpoint(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Ok! Scan the room for the closest checkpoint
int testeditor=-1;
//First up; is there a start point on this screen?
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i=0; i<edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//if() on screen
if(edentity[i].t==16 && testeditor==-1)
{
testeditor=i;
}
}
if(testeditor==-1)
{
game.edsavex = 160;
game.edsavey = 120;
game.edsaverx = 100;
game.edsavery = 100;
game.edsavegc = 0;
game.edsavey--;
Fix out-of-bounds array access in findstartpoint() Out-of-bounds array access is Undefined Behavior, which means Bad Things. In this particular case, it was indexing an array by using the `testeditor` variable. Which is fine, except it was indexing that array *in a conditional that only happens if `testeditor` is -1*. So it was indexing an array at position -1, which is Out of Bounds and is Not Good.
2020-01-22 06:43:01 +01:00
game.edsavedir=1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
//Start point spawn
int tx=(edentity[testeditor].x-(edentity[testeditor].x%40))/40;
int ty=(edentity[testeditor].y-(edentity[testeditor].y%30))/30;
game.edsavex = ((edentity[testeditor].x%40)*8)-4;
game.edsavey = (edentity[testeditor].y%30)*8;
game.edsaverx = 100+tx;
game.edsavery = 100+ty;
game.edsavegc = 0;
Fix inconsistencies with y-positions of spawns It seems like the start point of a custom level and all checkpoints in the game end up putting your spawn point one pixel away from the surface it touches, which seems like an oversight. I'm going to enforce some consistency here and make it so that all spawn points, whenever you start from a start point or a checkpoint, will always be correctly positioned flush with the surface they're standing on, and not one pixel more or less than that.
2020-10-06 08:13:07 +02:00
game.edsavey++;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.edsavedir=1-edentity[testeditor].p1;
}
}
int editorclass::findtrinket(int t)
{
int ttrinket=0;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(int i=0; i<(int)edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(i==t) return ttrinket;
if(edentity[i].t==9) ttrinket++;
}
return 0;
}
int editorclass::findcrewmate(int t)
{
int ttrinket=0;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(int i=0; i<(int)edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(i==t) return ttrinket;
if(edentity[i].t==15) ttrinket++;
}
return 0;
}
int editorclass::findwarptoken(int t)
{
int ttrinket=0;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(int i=0; i<(int)edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(i==t) return ttrinket;
if(edentity[i].t==13) ttrinket++;
}
return 0;
}
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
void editorclass::switch_tileset(const bool reversed /*= false*/)
{
const char* tilesets[] = {"Space Station", "Outside", "Lab", "Warp Zone", "Ship"};
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
int tiles = getroomprop(levx, levy)->tileset;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
if (reversed)
{
tiles--;
}
else
{
tiles++;
}
Fix Shift+F1 from Space Station tileset not switching to Ship So... it looks like being able to switch through tilesets backwards has been in 2.3 for a while, guess no one just uses 2.3 or the level editor that much. It seems like it's always been broken, too. If you were on the Space Station tileset (tileset 0), pressing Shift+F1 would keep you on the Space Station tileset instead of switching to the Ship (tileset 4). It looks like the problem here was mixing size_t and int together - so the modulus operation promoted the left-hand side to size_t, which is unsigned, so the -1 turned into SIZE_MAX, which is 18446744073709551615 on my system. You'll note that that ends in a 5, so the number is divisible by 5, meaning taking it modulo 5 leads to 0. So the tileset would be kept at 0. At least unsigned integer underflow/overflow is properly defined, so there's no UB here. Just careless type mixing going on. The solution is to make the modulus an int instead of a size_t. This introduces an implicit conversion, but I don't care because my compiler doesn't warn about it, and implicit conversion warnings ought to be disabled on MSVC anyway.
2021-01-09 00:02:17 +01:00
const int modulus = SDL_arraysize(tilesets);
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
tiles = (tiles % modulus + modulus) % modulus;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
setroomtileset(levx, levy, tiles);
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
clamp_tilecol(levx, levy);
char buffer[64];
SDL_snprintf(buffer, sizeof(buffer), "Now using %s Tileset", tilesets[tiles]);
note = buffer;
notedelay = 45;
updatetiles = true;
}
void editorclass::switch_tilecol(const bool reversed /*= false*/)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
int tilecol = getroomprop(levx, levy)->tilecol;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
if (reversed)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
tilecol--;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
}
else
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
tilecol++;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
setroomtilecol(levx, levy, tilecol);
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
clamp_tilecol(levx, levy, true);
notedelay = 45;
note = "Tileset Colour Changed";
updatetiles = true;
}
void editorclass::clamp_tilecol(const int rx, const int ry, const bool wrap /*= false*/)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = getroomprop(rx, ry);
const int tileset = room->tileset;
int tilecol = room->tilecol;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
Allow using Space Station tilecol -1 This tilecol conveniently lets players use one of the unpatterned Space Station tilesets you see on the left side of tiles.png but never get to use without Direct Mode. It does have a few weird quirks, but it should be safe to use.
2020-07-01 06:47:03 +02:00
int mincol = -1;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
int maxcol = 5;
Allow using Space Station tilecol -1 This tilecol conveniently lets players use one of the unpatterned Space Station tilesets you see on the left side of tiles.png but never get to use without Direct Mode. It does have a few weird quirks, but it should be safe to use.
2020-07-01 06:47:03 +02:00
// Only Space Station allows tileset -1
if (tileset != 0)
{
mincol = 0;
}
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
switch (tileset)
{
case 0:
maxcol = 31;
break;
case 1:
maxcol = 7;
break;
case 3:
maxcol = 6;
break;
case 5:
maxcol = 29;
break;
}
// If wrap is true, wrap-around, otherwise just cap
if (tilecol > maxcol)
{
tilecol = (wrap ? mincol : maxcol);
}
if (tilecol < mincol)
{
tilecol = (wrap ? maxcol : mincol);
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
setroomtilecol(rx, ry, tilecol);
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
}
void editorclass::switch_enemy(const bool reversed /*= false*/)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = getroomprop(levx, levy);
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
int enemy = room->enemytype;
Wrap around enemy type when switching enemy types Whoops. Forgot to do this earlier when adding the Shift+F3 hotkey. Otherwise the enemy type would become invalid and just turn into the default square.
2020-07-17 22:25:23 +02:00
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
if (reversed)
{
Wrap around enemy type when switching enemy types Whoops. Forgot to do this earlier when adding the Shift+F3 hotkey. Otherwise the enemy type would become invalid and just turn into the default square.
2020-07-17 22:25:23 +02:00
enemy--;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
}
else
{
Wrap around enemy type when switching enemy types Whoops. Forgot to do this earlier when adding the Shift+F3 hotkey. Otherwise the enemy type would become invalid and just turn into the default square.
2020-07-17 22:25:23 +02:00
enemy++;
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
}
Wrap around enemy type when switching enemy types Whoops. Forgot to do this earlier when adding the Shift+F3 hotkey. Otherwise the enemy type would become invalid and just turn into the default square.
2020-07-17 22:25:23 +02:00
const int modulus = 10;
enemy = (enemy % modulus + modulus) % modulus;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
setroomenemytype(levx, levy, enemy);
Wrap around enemy type when switching enemy types Whoops. Forgot to do this earlier when adding the Shift+F3 hotkey. Otherwise the enemy type would become invalid and just turn into the default square.
2020-07-17 22:25:23 +02:00
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
note = "Enemy Type Changed";
notedelay = 45;
}
Add editor saving/loading error messages Previously, the editor would always say it saved or loaded a level, even if it was not successful. For example, because a file to load does not exist, a file to save has illegal characters in its name or the name is too long to be stored. Now failure is reported. Also, when quitting the editor and saving before quitting is unsuccessful, the editor will abort quitting.
2020-06-02 12:59:54 +02:00
bool editorclass::load(std::string& _path)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
reset();
static const char *levelDir = "levels/";
Reduce dependency on libc functions During 2.3 development, there's been a gradual shift to using SDL stdlib functions instead of libc functions, but there are still some libc functions (or the same libc function but from the STL) in the code. Well, this patch replaces all the rest of them in one fell swoop. SDL's stdlib can replace most of these, but its SDL_min() and SDL_max() are inadequate - they aren't really functions, they're more like macros with a nasty penchant for double-evaluation. So I just made my own VVV_min() and VVV_max() functions and placed them in Maths.h instead, then replaced all the previous usages of min(), max(), std::min(), std::max(), SDL_min(), and SDL_max() with VVV_min() and VVV_max(). Additionally, there's no SDL_isxdigit(), so I just implemented my own VVV_isxdigit(). SDL has SDL_malloc() and SDL_free(), but they have some refcounting built in to them, so in order to use them with LodePNG, I have to replace the malloc() and free() that LodePNG uses. Which isn't too hard, I did it in a new file called ThirdPartyDeps.c, and LodePNG is now compiled with the LODEPNG_NO_COMPILE_ALLOCATORS definition. Lastly, I also refactored the awful strcpy() and strcat() usages in PLATFORM_migrateSaveData() to use SDL_snprintf() instead. I know save migration is getting axed in 2.4, but it still bothers me to have something like that in the codebase otherwise. Without further ado, here is the full list of functions that the codebase now uses: - SDL_strlcpy() instead of strcpy() - SDL_strlcat() instead of strcat() - SDL_snprintf() instead of sprintf(), strcpy(), or strcat() (see above) - VVV_min() instead of min(), std::min(), or SDL_min() - VVV_max() instead of max(), std::max(), or SDL_max() - VVV_isxdigit() instead of isxdigit() - SDL_strcmp() instead of strcmp() - SDL_strcasecmp() instead of strcasecmp() or Win32 strcmpi() - SDL_strstr() instead of strstr() - SDL_strlen() instead of strlen() - SDL_sscanf() instead of sscanf() - SDL_getenv() instead of getenv() - SDL_malloc() instead of malloc() (replacing in LodePNG as well) - SDL_free() instead of free() (replacing in LodePNG as well)
2021-01-12 01:17:45 +01:00
if (_path.compare(0, SDL_strlen(levelDir), levelDir) != 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
_path = levelDir + _path;
}
Per-level custom asset loading functionality (#262)
2020-06-01 01:31:02 +02:00
FILESYSTEM_unmountassets();
Add -playassets command-line option This is used if you're loading a level file from STDIN. The game needs to know the actual level assets directory you're referring to, since when it gets the level from STDIN, it doesn't know the actual filename of the level. Fixes #309.
2020-06-22 00:56:31 +02:00
if (game.playassets != "")
{
FILESYSTEM_mountassets(game.playassets.c_str());
}
else
{
FILESYSTEM_mountassets(_path.c_str());
}
Per-level custom asset loading functionality (#262)
2020-06-01 01:31:02 +02:00
Revert "Fix loading levels saved with 2.2 or earlier" This reverts commit c2c06444531ec176626faff0caf212c33f26463e. The correct solution for this wasn't to set the whitespace mode to COLLAPSE_WHITESPACE.
2020-06-17 00:45:01 +02:00
tinyxml2::XMLDocument doc;
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
if (!FILESYSTEM_loadTiXml2Document(_path.c_str(), doc))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
printf("No level %s to load :(\n", _path.c_str());
Add editor saving/loading error messages Previously, the editor would always say it saved or loaded a level, even if it was not successful. For example, because a file to load does not exist, a file to save has illegal characters in its name or the name is too long to be stored. Now failure is reported. Also, when quitting the editor and saving before quitting is unsuccessful, the editor will abort quitting.
2020-06-02 12:59:54 +02:00
return false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remember loaded custom level and read from it when saving My previous custom level forwards compatibility would only work if you saved to the same filename as you read from. But what if you saved to a new filename? Well, your extra XML is lost. Not to worry, I've introduced a variable that remembers the filepath of the currently-loaded level (the existing `filename` attribute is kind of weird and not really suited for this purpose, so). I tried to make it a simple `const char*`, but it turns out that's bad when you take the `c_str()` of an `std::string` that then gets destroyed, so it's best to use `std::string` in an `std::string` world. So now when you save a level, it'll attempt to open the original file, and if that doesn't exist then your extra XML gets lost anyway, but I shouldn't be expected to keep your XML if you delete the original file.
2020-11-03 18:55:26 +01:00
loaded_filepath = _path;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
tinyxml2::XMLHandle hDoc(&doc);
tinyxml2::XMLElement* pElem;
tinyxml2::XMLHandle hRoot(NULL);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
version = 0;
{
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
pElem=hDoc.FirstChildElement().ToElement();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
// should always have a valid root but handle gracefully if it does
if (!pElem)
{
printf("No valid root! Corrupt level file?\n");
}
pElem->QueryIntAttribute("version", &version);
// save this for later
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
hRoot=tinyxml2::XMLHandle(pElem);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
for( pElem = hRoot.FirstChildElement( "Data" ).FirstChild().ToElement(); pElem; pElem=pElem->NextSiblingElement())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
const char* pKey = pElem->Value();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
const char* pText = pElem->GetText() ;
if(pText == NULL)
{
pText = "";
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "MetaData") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
for( tinyxml2::XMLElement* subElem = pElem->FirstChildElement(); subElem; subElem= subElem->NextSiblingElement())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
const char* pKey_ = subElem->Value();
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
const char* pText_ = subElem->GetText() ;
if(pText_ == NULL)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
pText_ = "";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "Creator") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
EditorData::GetInstance().creator = pText_;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "Title") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
EditorData::GetInstance().title = pText_;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "Desc1") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
Desc1 = pText_;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "Desc2") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
Desc2 = pText_;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "Desc3") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
Desc3 = pText_;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "website") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
website = pText_;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add being able to override the one-way recolor Disabling the one-way recolor if assets are mounted is needed to make existing levels not look bad, but what about levels that want to use the recolor anyway? The best solution here is to just introduce another bool into the XML, and make the re-color opt-in and only present if assets are mounted if that tag is present.
2020-06-30 23:08:14 +02:00
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if(SDL_strcmp(pKey_, "onewaycol_override") == 0)
Add being able to override the one-way recolor Disabling the one-way recolor if assets are mounted is needed to make existing levels not look bad, but what about levels that want to use the recolor anyway? The best solution here is to just introduce another bool into the XML, and make the re-color opt-in and only present if assets are mounted if that tag is present.
2020-06-30 23:08:14 +02:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
onewaycol_override = help.Int(pText_);
Add being able to override the one-way recolor Disabling the one-way recolor if assets are mounted is needed to make existing levels not look bad, but what about levels that want to use the recolor anyway? The best solution here is to just introduce another bool into the XML, and make the re-color opt-in and only present if assets are mounted if that tag is present.
2020-06-30 23:08:14 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "mapwidth") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace all usages of atoi() with help.Int() This will prevent any undefined behavior that might occur as a result of having invalid input passed into atoi().
2020-08-07 06:31:29 +02:00
mapwidth = help.Int(pText);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "mapheight") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace all usages of atoi() with help.Int() This will prevent any undefined behavior that might occur as a result of having invalid input passed into atoi().
2020-08-07 06:31:29 +02:00
mapheight = help.Int(pText);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "levmusic") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Replace all usages of atoi() with help.Int() This will prevent any undefined behavior that might occur as a result of having invalid input passed into atoi().
2020-08-07 06:31:29 +02:00
levmusic = help.Int(pText);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "contents") == 0 && pText[0] != '\0')
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
int x = 0;
int y = 0;
char buffer[16];
size_t start = 0;
while (next_split_s(buffer, sizeof(buffer), &start, pText, ','))
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
{
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
const int idx = x + maxwidth*40*y;
if (INBOUNDS_ARR(idx, contents))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
contents[idx] = help.Int(buffer);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
++x;
if (x == mapwidth*40)
{
x = 0;
++y;
}
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "edEntities") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
for( tinyxml2::XMLElement* edEntityEl = pElem->FirstChildElement(); edEntityEl; edEntityEl=edEntityEl->NextSiblingElement())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Initialize temporary edentity when loading levels It is possible for any of the QueryIntAttribute()s to fail, most commonly if the attributes don't exist. If that happens, then that part of the temporary edentity won't be initialized, and we'll end up having a partially-uninitialized edentity - then doing much of anything with it will result in undefined behavior. To fix this, just initialize the temporary edentity.
2021-03-24 20:21:28 +01:00
edentities entity = edentities();
Use less STL when loading entity XML elements The STL here cannot be completely eliminated (because the custom entity object uses std::string), but at least we can avoid unnecessarily making std::strings until the very end.
2021-02-27 02:46:20 +01:00
const char* text = edEntityEl->GetText();
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
Use less STL when loading entity XML elements The STL here cannot be completely eliminated (because the custom entity object uses std::string), but at least we can avoid unnecessarily making std::strings until the very end.
2021-02-27 02:46:20 +01:00
if (text != NULL)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Use less STL when loading entity XML elements The STL here cannot be completely eliminated (because the custom entity object uses std::string), but at least we can avoid unnecessarily making std::strings until the very end.
2021-02-27 02:46:20 +01:00
size_t len = SDL_strlen(text);
Hardcode fix for next-line </edentity> This is really awful, but there's not much we can do. TinyXML-2 no matter what will never stop on newlines, so without changing the XML parser, this is the best we can do - just remove the "\n " (that's a linefeed plus exactly 12 spaces) if it appears at the end of the contents of an edentity tag. Also a giant comment for good measure.
2020-06-17 01:19:33 +02:00
// And now we come to the part where we have to deal with
// the terrible decisions of the past.
//
// For some reason, the closing tag of edentities generated
// by 2.2 and below has not only been put on a separate
// line, but also indented to match with the opening tag as
// well. Like this:
//
// <edentity ...>contents
// </edentity>
//
// Instead of doing <edentity ...>contents</edentity>.
//
// This is COMPLETELY terrible. This requires the XML to be
// parsed in an extremely specific and quirky way, which
// TinyXML-1 just happened to do.
//
// TinyXML-2 by default interprets the newline and the next
// indentation of whitespace literally, so you end up with
// tag contents that has a linefeed plus a bunch of extra
// spaces. You can't fix this by setting the whitespace
// mode to COLLAPSE_WHITESPACE, that does way more than
// TinyXML-1 ever did - it removes the leading whitespace
// from things like <edentity ...> this</edentity>, and
// collapses XML-encoded whitespace like <edentity ...>
// &#32; &#32;this</edentity>, which TinyXML-1 never did.
//
// Best solution here is to specifically hardcode removing
// the linefeed + the extremely specific amount of
// whitespace at the end of the contents.
Use less STL when loading entity XML elements The STL here cannot be completely eliminated (because the custom entity object uses std::string), but at least we can avoid unnecessarily making std::strings until the very end.
2021-02-27 02:46:20 +01:00
if (endsWith(text, "\n ")) // linefeed + exactly 12 spaces
Hardcode fix for next-line </edentity> This is really awful, but there's not much we can do. TinyXML-2 no matter what will never stop on newlines, so without changing the XML parser, this is the best we can do - just remove the "\n " (that's a linefeed plus exactly 12 spaces) if it appears at the end of the contents of an edentity tag. Also a giant comment for good measure.
2020-06-17 01:19:33 +02:00
{
// 12 spaces + 1 linefeed = 13 chars
Use less STL when loading entity XML elements The STL here cannot be completely eliminated (because the custom entity object uses std::string), but at least we can avoid unnecessarily making std::strings until the very end.
2021-02-27 02:46:20 +01:00
len -= 13;
Hardcode fix for next-line </edentity> This is really awful, but there's not much we can do. TinyXML-2 no matter what will never stop on newlines, so without changing the XML parser, this is the best we can do - just remove the "\n " (that's a linefeed plus exactly 12 spaces) if it appears at the end of the contents of an edentity tag. Also a giant comment for good measure.
2020-06-17 01:19:33 +02:00
}
Use less STL when loading entity XML elements The STL here cannot be completely eliminated (because the custom entity object uses std::string), but at least we can avoid unnecessarily making std::strings until the very end.
2021-02-27 02:46:20 +01:00
entity.scriptname = std::string(text, len);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
edEntityEl->QueryIntAttribute("x", &entity.x);
edEntityEl->QueryIntAttribute("y", &entity.y);
edEntityEl->QueryIntAttribute("t", &entity.t);
edEntityEl->QueryIntAttribute("p1", &entity.p1);
edEntityEl->QueryIntAttribute("p2", &entity.p2);
edEntityEl->QueryIntAttribute("p3", &entity.p3);
edEntityEl->QueryIntAttribute("p4", &entity.p4);
edEntityEl->QueryIntAttribute("p5", &entity.p5);
edEntityEl->QueryIntAttribute("p6", &entity.p6);
edentity.push_back(entity);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "levelMetaData") == 0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
int i = 0;
Convert editorclass::load() to TinyXML2 Ok, it's a bit of a more complicated structure, but it seems to load fine. I decided to test this one.
2020-06-04 03:03:00 +02:00
for( tinyxml2::XMLElement* edLevelClassElement = pElem->FirstChildElement(); edLevelClassElement; edLevelClassElement=edLevelClassElement->NextSiblingElement())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if (!INBOUNDS_ARR(i, level))
{
continue;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(edLevelClassElement->GetText() != NULL)
{
level[i].roomname = std::string(edLevelClassElement->GetText()) ;
}
edLevelClassElement->QueryIntAttribute("tileset", &level[i].tileset);
edLevelClassElement->QueryIntAttribute("tilecol", &level[i].tilecol);
edLevelClassElement->QueryIntAttribute("platx1", &level[i].platx1);
edLevelClassElement->QueryIntAttribute("platy1", &level[i].platy1);
edLevelClassElement->QueryIntAttribute("platx2", &level[i].platx2);
edLevelClassElement->QueryIntAttribute("platy2", &level[i].platy2);
edLevelClassElement->QueryIntAttribute("platv", &level[i].platv);
edLevelClassElement->QueryIntAttribute("enemyx1", &level[i].enemyx1);
edLevelClassElement->QueryIntAttribute("enemyy1", &level[i].enemyy1);
edLevelClassElement->QueryIntAttribute("enemyx2", &level[i].enemyx2);
edLevelClassElement->QueryIntAttribute("enemyy2", &level[i].enemyy2);
edLevelClassElement->QueryIntAttribute("enemytype", &level[i].enemytype);
edLevelClassElement->QueryIntAttribute("directmode", &level[i].directmode);
edLevelClassElement->QueryIntAttribute("warpdir", &level[i].warpdir);
i++;
}
}
Don't use std::strings when comparing key names There's no need to create an std::string for every single element just to see if it's a key name. At least in libstdc++, there's an optimization where std::strings that are 16 characters or less don't allocate on the heap, and instead use the internal 16-char buffer directly in the control structure of the std::string. However, it's not guaranteed that all the element names we'll get will always be 16 chars or less, and in case the std::string does end up allocating on the heap, we have no reason for it to allocate on the heap; so we should just convert these string comparisons to C strings instead.
2021-03-06 19:31:17 +01:00
if (SDL_strcmp(pKey, "script") == 0 && pText[0] != '\0')
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
Script script_;
bool headerfound = false;
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
size_t start = 0;
size_t len = 0;
size_t prev_start = 0;
while (next_split(&start, &len, &pText[start], '|'))
{
if (len > 0 && pText[prev_start + len - 1] == ':')
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
{
Clean up whitespace in script XML parsing code There is now a space between all 'if's and their opening parentheses. I've also cleaned up the blank line spacing so the code looks better.
2021-02-13 01:25:32 +01:00
if (headerfound)
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
{
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
script.customscripts.push_back(script_);
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
}
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
script_.name = std::string(&pText[prev_start], len - 1);
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
script_.contents.clear();
headerfound = true;
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
goto next;
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
}
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
Clean up whitespace in script XML parsing code There is now a space between all 'if's and their opening parentheses. I've also cleaned up the blank line spacing so the code looks better.
2021-02-13 01:25:32 +01:00
if (headerfound)
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
{
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
script_.contents.push_back(std::string(&pText[prev_start], len));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor loading arrays from XML to not use the STL The current way "arrays" from XML files are loaded (before this commit is applied) goes something like this: 1. Read the buffer of the contents of the tag using TinyXML-2. 2. Allocate a buffer on the heap of the same size, and copy the existing buffer to it. (This is what the statement `std::string TextString = pText;` does.) 3. For each delimiter in the heap-allocated buffer... a. Allocate another buffer on the heap, and copy the characters from the previous delimiter to the delimiter you just hit. b. Then allocate the buffer AGAIN, to copy it into an std::vector. 4. Then re-allocate every single buffer YET AGAIN, because you need to make a copy of the std::vector in split() to return it to the caller. As you can see, the existing way uses a lot of memory allocations and data marshalling, just to split some text. The problem here is mostly making a temporary std::vector of split text, before doing any actual useful work (most likely, putting it into an array or ANOTHER std::vector - if the latter, then that's yet another memory allocation on top of the memory allocation you already did; this memory allocation is unavoidable, unlike the ones mentioned earlier, which should be removed). So I noticed that since we're iterating over the entire string once (just to shove its contents into a temporary std::vector), and then basically iterating over it again - why can't the whole thing just be more immediate, and just be iterated over once? So that's what I've done here. I've axed the split() function (both of them, actually), and made next_split() and next_split_s(). next_split() will take an existing string and a starting index, and it will find the next occurrence of the given delimiter in the string. Once it does so, it will return the length from the previous starting index, and modify your starting index as well. The price for immediateness is that you're supposed to handle keeping the index of the previous starting index around in order to be able to use the function; updating it after each iteration is also your responsibility. (By the way, next_split() doesn't use SDL_strchr(), because we can't get the length of the substring for the last substring. We could handle this special case specifically, but it'd be uglier; it also introduces iterating over the last substring twice, when we only need to do it once.) next_split_s() does the same thing as next_split(), except it will copy the resulting substring into a buffer that you provide (along with its size). Useful if you don't particularly care about the length of the substring. All callers have been updated accordingly. This new system does not make ANY heap allocations at all; at worst, it allocates a temporary buffer on the stack, but that's only if you use next_split_s(); plus, it'd be a fixed-size buffer, and stack allocations are negligible anyway. This improves performance when loading any sort of XML file, especially loading custom levels - which, on my system at least, I can noticeably tell (there's less of a freeze when I load in to a custom level with lots of scripts). It also decreases memory usage, because the heap isn't being used just to iterate over some delimiters when XML files are loaded.
2021-02-13 01:37:29 +01:00
next:
prev_start = start;
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
}
Clean up whitespace in script XML parsing code There is now a space between all 'if's and their opening parentheses. I've also cleaned up the blank line spacing so the code looks better.
2021-02-13 01:25:32 +01:00
Clean up comments in script XML parsing code I'm partial to slash-asterisk-style comments, so I'll use those here. Also, having a space after the start of comments is good. I've also removed the "Add the script if we have a preceding header" comments since it can be inferred by reading the surrounding code.
2021-02-13 01:29:08 +01:00
/* Add the last script */
Clean up whitespace in script XML parsing code There is now a space between all 'if's and their opening parentheses. I've also cleaned up the blank line spacing so the code looks better.
2021-02-13 01:25:32 +01:00
if (headerfound)
Unindent from collapsing empty pText check As always, the diff algorithms do terribly with unindentation, so I'm doing the actual unindenting in this commit.
2021-02-12 22:53:01 +01:00
{
script.customscripts.push_back(script_);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
gethooks();
version=2;
Add editor saving/loading error messages Previously, the editor would always say it saved or loaded a level, even if it was not successful. For example, because a file to load does not exist, a file to save has illegal characters in its name or the name is too long to be stored. Now failure is reported. Also, when quitting the editor and saving before quitting is unsuccessful, the editor will abort quitting.
2020-06-02 12:59:54 +02:00
return true;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add editor saving/loading error messages Previously, the editor would always say it saved or loaded a level, even if it was not successful. For example, because a file to load does not exist, a file to save has illegal characters in its name or the name is too long to be stored. Now failure is reported. Also, when quitting the editor and saving before quitting is unsuccessful, the editor will abort quitting.
2020-06-02 12:59:54 +02:00
bool editorclass::save(std::string& _path)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Convert editorclass::save() to TinyXML2 I tested this one, too. But it seems to be fine as well.
2020-06-04 03:12:12 +02:00
tinyxml2::XMLDocument doc;
Remember loaded custom level and read from it when saving My previous custom level forwards compatibility would only work if you saved to the same filename as you read from. But what if you saved to a new filename? Well, your extra XML is lost. Not to worry, I've introduced a variable that remembers the filepath of the currently-loaded level (the existing `filename` attribute is kind of weird and not really suited for this purpose, so). I tried to make it a simple `const char*`, but it turns out that's bad when you take the `c_str()` of an `std::string` that then gets destroyed, so it's best to use `std::string` in an `std::string` world. So now when you save a level, it'll attempt to open the original file, and if that doesn't exist then your extra XML gets lost anyway, but I shouldn't be expected to keep your XML if you delete the original file.
2020-11-03 18:55:26 +01:00
std::string newpath("levels/" + _path);
// Try to preserve the XML of the currently-loaded one
bool already_exists = !loaded_filepath.empty() && FILESYSTEM_loadTiXml2Document(loaded_filepath.c_str(), doc);
if (!already_exists && !loaded_filepath.empty())
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
{
Remember loaded custom level and read from it when saving My previous custom level forwards compatibility would only work if you saved to the same filename as you read from. But what if you saved to a new filename? Well, your extra XML is lost. Not to worry, I've introduced a variable that remembers the filepath of the currently-loaded level (the existing `filename` attribute is kind of weird and not really suited for this purpose, so). I tried to make it a simple `const char*`, but it turns out that's bad when you take the `c_str()` of an `std::string` that then gets destroyed, so it's best to use `std::string` in an `std::string` world. So now when you save a level, it'll attempt to open the original file, and if that doesn't exist then your extra XML gets lost anyway, but I shouldn't be expected to keep your XML if you delete the original file.
2020-11-03 18:55:26 +01:00
printf("Currently-loaded %s not found\n", loaded_filepath.c_str());
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
}
Remember loaded custom level and read from it when saving My previous custom level forwards compatibility would only work if you saved to the same filename as you read from. But what if you saved to a new filename? Well, your extra XML is lost. Not to worry, I've introduced a variable that remembers the filepath of the currently-loaded level (the existing `filename` attribute is kind of weird and not really suited for this purpose, so). I tried to make it a simple `const char*`, but it turns out that's bad when you take the `c_str()` of an `std::string` that then gets destroyed, so it's best to use `std::string` in an `std::string` world. So now when you save a level, it'll attempt to open the original file, and if that doesn't exist then your extra XML gets lost anyway, but I shouldn't be expected to keep your XML if you delete the original file.
2020-11-03 18:55:26 +01:00
loaded_filepath = newpath;
Convert editorclass::save() to TinyXML2 I tested this one, too. But it seems to be fine as well.
2020-06-04 03:12:12 +02:00
tinyxml2::XMLElement* msg;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_declaration(doc);
tinyxml2::XMLElement * root = xml::update_element(doc, "MapData");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
root->SetAttribute("version",version);
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_comment(root, " Save file ");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
tinyxml2::XMLElement * data = xml::update_element(root, "Data");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
msg = xml::update_element(data, "MetaData");
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//getUser
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Creator", EditorData::GetInstance().creator.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Title", EditorData::GetInstance().title.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Created", version);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Modified", EditorData::GetInstance().modifier.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Modifiers", version);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Desc1", Desc1.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Desc2", Desc2.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "Desc3", Desc3.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "website", website.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add being able to override the one-way recolor Disabling the one-way recolor if assets are mounted is needed to make existing levels not look bad, but what about levels that want to use the recolor anyway? The best solution here is to just introduce another bool into the XML, and make the re-color opt-in and only present if assets are mounted if that tag is present.
2020-06-30 23:08:14 +02:00
if (onewaycol_override)
{
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(msg, "onewaycol_override", onewaycol_override);
}
else
{
// Delete the element. I could just delete one, but just to be sure,
// I will delete all of them if there are more than one
tinyxml2::XMLElement* element;
while ((element = msg->FirstChildElement("onewaycol_override"))
!= NULL)
{
doc.DeleteNode(element);
}
Add being able to override the one-way recolor Disabling the one-way recolor if assets are mounted is needed to make existing levels not look bad, but what about levels that want to use the recolor anyway? The best solution here is to just introduce another bool into the XML, and make the re-color opt-in and only present if assets are mounted if that tag is present.
2020-06-30 23:08:14 +02:00
}
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(data, "mapwidth", mapwidth);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(data, "mapheight", mapheight);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(data, "levmusic", levmusic);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//New save format
std::string contentsString="";
for(int y = 0; y < mapheight*30; y++ )
{
for(int x = 0; x < mapwidth*40; x++ )
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
contentsString += help.String(getabstile(x, y)) + ",";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(data, "contents", contentsString.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
msg = xml::update_element_delete_contents(data, "edEntities");
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i = 0; i < edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Convert editorclass::save() to TinyXML2 I tested this one, too. But it seems to be fine as well.
2020-06-04 03:12:12 +02:00
tinyxml2::XMLElement *edentityElement = doc.NewElement( "edentity" );
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
edentityElement->SetAttribute( "x", edentity[i].x);
edentityElement->SetAttribute( "y", edentity[i].y);
edentityElement->SetAttribute( "t", edentity[i].t);
edentityElement->SetAttribute( "p1", edentity[i].p1);
edentityElement->SetAttribute( "p2", edentity[i].p2);
edentityElement->SetAttribute( "p3", edentity[i].p3);
edentityElement->SetAttribute( "p4", edentity[i].p4);
edentityElement->SetAttribute( "p5", edentity[i].p5);
edentityElement->SetAttribute( "p6", edentity[i].p6);
Convert editorclass::save() to TinyXML2 I tested this one, too. But it seems to be fine as well.
2020-06-04 03:12:12 +02:00
edentityElement->LinkEndChild( doc.NewText( edentity[i].scriptname.c_str() )) ;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
msg->LinkEndChild( edentityElement );
}
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
msg = xml::update_element_delete_contents(data, "levelMetaData");
Don't hardcode 400 in editorclass::save() That way, if the size of `level` changes, this code won't end up being wrong.
2020-09-10 07:13:59 +02:00
for(size_t i = 0; i < SDL_arraysize(level); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Convert editorclass::save() to TinyXML2 I tested this one, too. But it seems to be fine as well.
2020-06-04 03:12:12 +02:00
tinyxml2::XMLElement *edlevelclassElement = doc.NewElement( "edLevelClass" );
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
edlevelclassElement->SetAttribute( "tileset", level[i].tileset);
edlevelclassElement->SetAttribute( "tilecol", level[i].tilecol);
edlevelclassElement->SetAttribute( "platx1", level[i].platx1);
edlevelclassElement->SetAttribute( "platy1", level[i].platy1);
edlevelclassElement->SetAttribute( "platx2", level[i].platx2);
edlevelclassElement->SetAttribute( "platy2", level[i].platy2);
edlevelclassElement->SetAttribute( "platv", level[i].platv);
edlevelclassElement->SetAttribute( "enemyx1", level[i].enemyx1);
edlevelclassElement->SetAttribute( "enemyy1", level[i].enemyy1);
edlevelclassElement->SetAttribute( "enemyx2", level[i].enemyx2);
edlevelclassElement->SetAttribute( "enemyy2", level[i].enemyy2);
edlevelclassElement->SetAttribute( "enemytype", level[i].enemytype);
edlevelclassElement->SetAttribute( "directmode", level[i].directmode);
edlevelclassElement->SetAttribute( "warpdir", level[i].warpdir);
Convert editorclass::save() to TinyXML2 I tested this one, too. But it seems to be fine as well.
2020-06-04 03:12:12 +02:00
edlevelclassElement->LinkEndChild( doc.NewText( level[i].roomname.c_str() )) ;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
msg->LinkEndChild( edlevelclassElement );
}
std::string scriptString;
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
for(size_t i = 0; i < script.customscripts.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
Script& script_ = script.customscripts[i];
scriptString += script_.name + ":|";
Fix using ii instead of i in script serialization Otherwise this results in an infinite loop. Whoops.
2021-02-16 06:11:08 +01:00
for (size_t ii = 0; ii < script_.contents.size(); ++ii)
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
{
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
scriptString += script_.contents[ii];
Add space after lines terminated by a colon in scripts (#479)
2020-09-15 02:34:12 +02:00
// Inserts a space if the line ends with a :
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
if (script_.contents[ii].length() && *script_.contents[ii].rbegin() == ':')
Add space after lines terminated by a colon in scripts (#479)
2020-09-15 02:34:12 +02:00
{
scriptString += " ";
}
scriptString += "|";
Refactor custom scripts to not be stored in one giant vector of lines This commit refactors custom level scripts to no longer be stored in one giant vector containing not only every single script name, but every single script's contents as well. More specifically, scriptclass::customscript has been converted to an std::vector<Script> scriptclass::customscripts (note the extra S), and a Script is just a struct with an std::string name and std::vector<std::string> contents. This is an improvement in both performance and maintainability. The game no longer has to look through script contents in case they're actually script names, and then manually extract the script contents from there. Instead, all it has to do is look for script names only. And the contents are provided for free. This results in a performance gain. Also, the old system resulted in lots of boilerplate everywhere anytime scripts had to be handled or parsed. Now, the boilerplate is only done when saving or loading a custom level. This makes code quality much, much better. To be sure I didn't actually change anything, I tested by first saving Dimension Open in current 2.3 (because current 2.3 gets rid of the awful edentity whitespace), and then resaved it on this patch. There is absolutely no difference between the current-2.3-resave and this-patch-resave.
2020-06-12 02:31:57 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Add XML forwards compatibility to custom level files Custom level files now have forwards compatibility - except that some XML objects will simply discard contents and attributes they don't see fit. For instance, edentities and level properties will not preserve newer attributes or contents. This is because preserving them would require having to track the XML object as part of the edentity internally, because the edentity might change places or even be deleted throughout the course of editing someone's level. I opted to not add support for preserving objects like these, because frankly, the put-everything-in-one-file level format was and still is a terrible idea, and we should probably switch to a new format in the future that isn't single-file. So when that happens, there won't be a need to preserve XML attributes on edentities.
2020-09-25 18:31:03 +02:00
xml::update_tag(data, "script", scriptString.c_str());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remember loaded custom level and read from it when saving My previous custom level forwards compatibility would only work if you saved to the same filename as you read from. But what if you saved to a new filename? Well, your extra XML is lost. Not to worry, I've introduced a variable that remembers the filepath of the currently-loaded level (the existing `filename` attribute is kind of weird and not really suited for this purpose, so). I tried to make it a simple `const char*`, but it turns out that's bad when you take the `c_str()` of an `std::string` that then gets destroyed, so it's best to use `std::string` in an `std::string` world. So now when you save a level, it'll attempt to open the original file, and if that doesn't exist then your extra XML gets lost anyway, but I shouldn't be expected to keep your XML if you delete the original file.
2020-11-03 18:55:26 +01:00
return FILESYSTEM_saveTiXml2Document(newpath.c_str(), doc);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static void addedentity( int xp, int yp, int tp, int p1 = 0, int p2 = 0, int p3 = 0, int p4 = 0, int p5 = 320, int p6 = 240)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
edentities entity;
entity.x=xp;
entity.y=yp;
entity.t=tp;
entity.p1=p1;
entity.p2=p2;
entity.p3=p3;
entity.p4=p4;
entity.p5=p5;
entity.p6=p6;
entity.scriptname="";
edentity.push_back(entity);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static void removeedentity( int t )
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
edentity.erase(edentity.begin() + t);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static int edentat( int xp, int yp )
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i=0; i<edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(edentity[i].x==xp && edentity[i].y==yp) return i;
}
return -1;
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static void fillbox( int x, int y, int x2, int y2, int c )
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, x, y, x2-x, 1, c);
FillRect(graphics.backBuffer, x, y2-1, x2-x, 1, c);
FillRect(graphics.backBuffer, x, y, 1, y2-y, c);
FillRect(graphics.backBuffer, x2-1, y, 1, y2-y, c);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static void fillboxabs( int x, int y, int x2, int y2, int c )
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, x, y, x2, 1, c);
FillRect(graphics.backBuffer, x, y+y2-1, x2, 1, c);
FillRect(graphics.backBuffer, x, y, 1, y2, c);
FillRect(graphics.backBuffer, x+x2-1, y, 1, y2, c);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorclass::generatecustomminimap(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
map.customwidth=mapwidth;
map.customheight=mapheight;
map.customzoom=1;
if(map.customwidth<=10 && map.customheight<=10) map.customzoom=2;
if(map.customwidth<=5 && map.customheight<=5) map.customzoom=4;
//Set minimap offsets
if(map.customzoom==4)
{
map.custommmxoff=24*(5-map.customwidth);
map.custommmxsize=240-(map.custommmxoff*2);
map.custommmyoff=18*(5-map.customheight);
map.custommmysize=180-(map.custommmyoff*2);
}
else if(map.customzoom==2)
{
map.custommmxoff=12*(10-map.customwidth);
map.custommmxsize=240-(map.custommmxoff*2);
map.custommmyoff=9*(10-map.customheight);
map.custommmysize=180-(map.custommmyoff*2);
}
else
{
map.custommmxoff=6*(20-map.customwidth);
map.custommmxsize=240-(map.custommmxoff*2);
map.custommmyoff=int(4.5*(20-map.customheight));
map.custommmysize=180-(map.custommmyoff*2);
}
Fix regression with background of level minimaps not being black I had misread this line in #629 and thought that it was just clearing the entire surface, when really it was filling the surface with opaque black. ClearSurface() would instead make it transparent, which would mean when it got drawn, it would get drawn against blue, and not black. Whoops.
2021-03-03 21:15:43 +01:00
FillRect(graphics.images[12], graphics.getRGB(0, 0, 0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
int tm=0;
int temp=0;
//Scan over the map size
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
if(mapheight<=5 && mapwidth<=5)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//4x map
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
for(int j2=0; j2<mapheight; j2++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
for(int i2=0; i2<mapwidth; i2++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Ok, now scan over each square
tm=196;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(getroomprop(i2, j2)->tileset==1) tm=96;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for(int j=0; j<36; j++)
{
for(int i=0; i<48; i++)
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
temp=absfree(int(i*0.83) + (i2*40),int(j*0.83)+(j2*30));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(temp>=1)
{
//Fill in this pixel
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.images[12], (i2*48)+i, (j2*36)+j, 1, 1, graphics.getRGB(tm, tm, tm));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
}
}
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
else if(mapheight<=10 && mapwidth<=10)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//2x map
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
for(int j2=0; j2<mapheight; j2++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
for(int i2=0; i2<mapwidth; i2++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Ok, now scan over each square
tm=196;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(getroomprop(i2, j2)->tileset==1) tm=96;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for(int j=0; j<18; j++)
{
for(int i=0; i<24; i++)
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
temp=absfree(int(i*1.6) + (i2*40),int(j*1.6)+(j2*30));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(temp>=1)
{
//Fill in this pixel
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.images[12], (i2*24)+i, (j2*18)+j, 1, 1, graphics.getRGB(tm, tm, tm));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
}
}
else
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
for(int j2=0; j2<mapheight; j2++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
for(int i2=0; i2<mapwidth; i2++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Ok, now scan over each square
tm=196;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(getroomprop(i2, j2)->tileset==1) tm=96;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for(int j=0; j<9; j++)
{
for(int i=0; i<12; i++)
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
temp=absfree(3+(i*3) + (i2*40),(j*3)+(j2*30));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(temp>=1)
{
//Fill in this pixel
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.images[12], (i2*12)+i, (j2*9)+j, 1, 1, graphics.getRGB(tm, tm, tm));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
}
}
}
Add '#if !defined(NO_EDITOR)' guards around editorinput/render/logic These functions aren't needed in a NO_EDITOR build, so it's useful to reduce the binary size this way.
2020-06-20 00:23:28 +02:00
#if !defined(NO_EDITOR)
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static void editormenurender(int tr, int tg, int tb)
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
extern editorclass ed;
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
switch (game.currentmenuname)
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
{
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::ed_settings:
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
graphics.bigprint( -1, 75, "Map Settings", tr, tg, tb, true);
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
if (game.currentmenuoption == 3)
{
if (!game.ghostsenabled)
graphics.Print(2, 230, "Editor ghost trail is OFF", tr/2, tg/2, tb/2);
else
graphics.Print(2, 230, "Editor ghost trail is ON", tr, tg, tb);
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::ed_desc:
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
if(ed.titlemod)
{
if(ed.entframe<2)
{
graphics.bigprint( -1, 35, key.keybuffer+"_", tr, tg, tb, true);
}
else
{
graphics.bigprint( -1, 35, key.keybuffer+" ", tr, tg, tb, true);
}
}
else
{
graphics.bigprint( -1, 35, EditorData::GetInstance().title, tr, tg, tb, true);
}
if(ed.creatormod)
{
if(ed.entframe<2)
{
graphics.Print( -1, 60, "by " + key.keybuffer+ "_", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 60, "by " + key.keybuffer+ " ", tr, tg, tb, true);
}
}
else
{
graphics.Print( -1, 60, "by " + EditorData::GetInstance().creator, tr, tg, tb, true);
}
if(ed.websitemod)
{
if(ed.entframe<2)
{
graphics.Print( -1, 70, key.keybuffer+"_", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 70, key.keybuffer+" ", tr, tg, tb, true);
}
}
else
{
graphics.Print( -1, 70, ed.website, tr, tg, tb, true);
}
if(ed.desc1mod)
{
if(ed.entframe<2)
{
graphics.Print( -1, 90, key.keybuffer+"_", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 90, key.keybuffer+" ", tr, tg, tb, true);
}
}
else
{
graphics.Print( -1, 90, ed.Desc1, tr, tg, tb, true);
}
if(ed.desc2mod)
{
if(ed.entframe<2)
{
graphics.Print( -1, 100, key.keybuffer+"_", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 100, key.keybuffer+" ", tr, tg, tb, true);
}
}
else
{
graphics.Print( -1, 100, ed.Desc2, tr, tg, tb, true);
}
if(ed.desc3mod)
{
if(ed.entframe<2)
{
graphics.Print( -1, 110, key.keybuffer+"_", tr, tg, tb, true);
}
else
{
graphics.Print( -1, 110, key.keybuffer+" ", tr, tg, tb, true);
}
}
else
{
graphics.Print( -1, 110, ed.Desc3, tr, tg, tb, true);
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::ed_music:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
{
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
graphics.bigprint( -1, 65, "Map Music", tr, tg, tb, true);
graphics.Print( -1, 85, "Current map music:", tr, tg, tb, true);
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
std::string songname;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
switch(ed.levmusic)
{
case 0:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "No background music";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 1:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "1: Pushing Onwards";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 2:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "2: Positive Force";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 3:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "3: Potential for Anything";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 4:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "4: Passion for Exploring";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
Add names for previously disallowed songs That way, they don't show up as "?: something else" and their proper names are shown. I didn't update the song numbers to include the newly-allowed songs because otherwise it'd no longer correlate with what song numbers you use for the music() simplified command.
2020-07-01 03:41:20 +02:00
case 5:
songname = "N/A: Pause";
break;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
case 6:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "5: Presenting VVVVVV";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
Add names for previously disallowed songs That way, they don't show up as "?: something else" and their proper names are shown. I didn't update the song numbers to include the newly-allowed songs because otherwise it'd no longer correlate with what song numbers you use for the music() simplified command.
2020-07-01 03:41:20 +02:00
case 7:
songname = "N/A: Plenary";
break;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
case 8:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "6: Predestined Fate";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
Add names for previously disallowed songs That way, they don't show up as "?: something else" and their proper names are shown. I didn't update the song numbers to include the newly-allowed songs because otherwise it'd no longer correlate with what song numbers you use for the music() simplified command.
2020-07-01 03:41:20 +02:00
case 9:
songname = "N/A: ecroF evitisoP";
break;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
case 10:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "7: Popular Potpourri";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 11:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "8: Pipe Dream";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 12:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "9: Pressure Cooker";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 13:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "10: Paced Energy";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
case 14:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "11: Piercing the Sky";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
Add names for previously disallowed songs That way, they don't show up as "?: something else" and their proper names are shown. I didn't update the song numbers to include the newly-allowed songs because otherwise it'd no longer correlate with what song numbers you use for the music() simplified command.
2020-07-01 03:41:20 +02:00
case 15:
songname = "N/A: Predestined Fate Remix";
break;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
default:
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
songname = "?: something else";
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
break;
}
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
graphics.Print( -1, 120, songname, tr, tg, tb, true);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
De-duplicate editor music name printing No need to copy-paste the graphics.Print() for every single case.
2020-07-01 03:40:18 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::ed_quit:
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
graphics.bigprint( -1, 90, "Save before", tr, tg, tb, true);
graphics.bigprint( -1, 110, "quitting?", tr, tg, tb, true);
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
default:
break;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
}
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorrender(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
extern editorclass ed;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = ed.getroomprop(ed.levx, ed.levy);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Draw grid
Change all surface-clearing FillRect()s to use ClearSurface() ClearSurface() is less verbose than doing it the old way, and also conveys intent clearer. Plus, some of these FillRect()s had hardcoded width and height values, whereas ClearSurface() doesn't - meaning this change also has better future-proofing, in case the widths and heights of the surfaces involved change in the future.
2021-02-26 00:37:03 +01:00
ClearSurface(graphics.backBuffer);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
for(int j=0; j<30; j++)
{
for(int i=0; i<40; i++)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(8,8,8)); //a simple grid
if(i%4==0) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(16,16,16));
if(j%4==0) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(16,16,16));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Minor guides
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
if(i==9) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(24,24,24));
if(i==30) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(24,24,24));
if(j==6 || j==7) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(24,24,24));
if(j==21 || j==22) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(24,24,24));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Major guides
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
if(i==20 || i==19) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(32,32,32));
if(j==14) fillbox(i*8, j*8, (i*8)+7, (j*8)+7, graphics.getRGB(32,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
//Or draw background
if(!ed.settingsmod)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->warpdir)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 1:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.rcol=ed.getwarpbackground(ed.levx, ed.levy);
graphics.drawbackground(3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.rcol=ed.getwarpbackground(ed.levx, ed.levy);
graphics.drawbackground(4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.rcol=ed.getwarpbackground(ed.levx, ed.levy);
graphics.drawbackground(5);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
default:
break;
}
}
//Draw map, in function
int temp;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->tileset==0 || room->tileset==10)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for (int j = 0; j < 30; j++)
{
for (int i = 0; i < 40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
temp=ed.gettile(ed.levx, ed.levy, i, j);
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
if(temp>0) graphics.drawtile(i*8,j*8,temp);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
else
{
for (int j = 0; j < 30; j++)
{
for (int i = 0; i < 40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
temp=ed.gettile(ed.levx, ed.levy, i, j);
Remove unused arguments from Graphics::drawtile2() The 'r', 'g', and 'b' arguments do absolutely nothing. Except unlike Graphics::drawtile(), there's only one version of Graphics::drawtile2(), so just remove those args and update callers.
2020-04-02 00:47:35 +02:00
if(temp>0) graphics.drawtile2(i*8,j*8,temp);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
//Edge tile fix
//Buffer the sides of the new room with tiles from other rooms, to ensure no gap problems.
for(int j=0; j<30; j++)
{
//left edge
if(ed.freewrap((ed.levx*40)-1,j+(ed.levy*30))==1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,j*8, 2,8, graphics.getRGB(255,255,255-help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
//right edge
if(ed.freewrap((ed.levx*40)+40,j+(ed.levy*30))==1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 318,j*8, 2,8, graphics.getRGB(255,255,255-help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
for(int i=0; i<40; i++)
{
if(ed.freewrap((ed.levx*40)+i,(ed.levy*30)-1)==1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, i*8,0, 8,2, graphics.getRGB(255,255,255-help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(ed.freewrap((ed.levx*40)+i,30+(ed.levy*30))==1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, i*8,238, 8,2, graphics.getRGB(255,255,255-help.glow));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
//Draw entities
obj.customplatformtile=game.customcol*12;
Move temp variable off of editorclass Again, basically no reason for it to exist on the class itself. The usage of the variable was replaced with temp2 instead of temp because there was already a temp variable in the function it was used in.
2020-07-03 04:28:35 +02:00
int temp2=edentat(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30));
Draw editor entities according to ingame order Ingame entities are drawn backwards, probably to draw the player on top, being entity 0 (usually, at least). Make the level editor draw entities in the same order.
2020-01-27 02:15:49 +01:00
Fix entities in the Warp Zone's gray tileset not being gray in the editor (#480) In-level, they were made to be gray in #323. The editor does not reflect this however; they're still shown as green. For the same reasons in #323, this adds special cases to draw the entities as gray. Closes #372. Also, I changed my name in contributors.txt to be my username as I didn't feel comfortable with it being my name. Co-authored-by: Misa <ness.of.onett.earthbound@gmail.com>
2020-09-25 19:35:03 +02:00
// Special case for drawing gray entities
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
bool custom_gray = room->tileset == 3 && room->tilecol == 6;
Fix entities in the Warp Zone's gray tileset not being gray in the editor (#480) In-level, they were made to be gray in #323. The editor does not reflect this however; they're still shown as green. For the same reasons in #323, this adds special cases to draw the entities as gray. Closes #372. Also, I changed my name in contributors.txt to be my username as I didn't feel comfortable with it being my name. Co-authored-by: Misa <ness.of.onett.earthbound@gmail.com>
2020-09-25 19:35:03 +02:00
colourTransform gray_ct;
gray_ct.colour = 0xFFFFFFFF;
Draw editor entities according to ingame order Ingame entities are drawn backwards, probably to draw the player on top, being entity 0 (usually, at least). Make the level editor draw entities in the same order.
2020-01-27 02:15:49 +01:00
// Draw entities backward to remain accurate with ingame
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for (int i = edentity.size() - 1; i >= 0; i--)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
point tpoint;
SDL_Rect drawRect;
Fix variables shadowing other variables In C++, when you have two variables in different scopes with the same name, the inner scope wins. Except you have to be really careful because sometimes they're not (#507). So it's better to just always have unique variable names and make sure to never clash a name with a variable in an outer scope - after all, the C++ compiler and standard might be fine with it, but that doesn't mean humans can't make mistakes reading or writing it. Usually I just renamed the inner variables, but for tx/ty in editor.cpp, I just got rid of the ridiculous overcomplicated modulo calculations and replaced them with actual simple modulo calculations, because the existing ones were just ridiculous. Actually, somebody ought to find every instance of the overcomplicated modulos and replace them with the actual good ones, because it's really stupid, quite frankly...
2020-11-04 09:37:46 +01:00
//if() on screen
Fix edentities not rendering at all in the editor What's the difference between a slash sign and a percent sign? Well, a percent sign is just a slash sign with two extra oranges in between, but those two oranges make a huuuuge difference...
2020-11-08 02:12:54 +01:00
if(edentity[i].x / 40 == ed.levx && edentity[i].y / 30 == ed.levy)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
switch(edentity[i].t)
{
case 1: //Entities
Fix entities in the Warp Zone's gray tileset not being gray in the editor (#480) In-level, they were made to be gray in #323. The editor does not reflect this however; they're still shown as green. For the same reasons in #323, this adds special cases to draw the entities as gray. Closes #372. Also, I changed my name in contributors.txt to be my username as I didn't feel comfortable with it being my name. Co-authored-by: Misa <ness.of.onett.earthbound@gmail.com>
2020-09-25 19:35:03 +02:00
if (custom_gray) {
graphics.setcol(18);
ed.entcolreal = graphics.ct.colour;
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),ed.getenemyframe(room->enemytype),ed.entcolreal);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
if(edentity[i].p1==0) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+4,(edentity[i].y*8)- (ed.levy*30*8)+4, "V", 255, 255, 255 - help.glow, false);
if(edentity[i].p1==1) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+4,(edentity[i].y*8)- (ed.levy*30*8)+4, "^", 255, 255, 255 - help.glow, false);
if(edentity[i].p1==2) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+4,(edentity[i].y*8)- (ed.levy*30*8)+4, "<", 255, 255, 255 - help.glow, false);
if(edentity[i].p1==3) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+4,(edentity[i].y*8)- (ed.levy*30*8)+4, ">", 255, 255, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,16,graphics.getBGR(255,164,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2: //Threadmills & platforms
Add bounds-check to entcolours in editor rendering I have no idea why neither conveyors and moving and disappearing platforms rendered in the editor or in-game use Graphics::drawentcolours(), but this needs to be bounds-checked just as I did for the in-game rendering function.
2020-09-16 00:21:34 +02:00
if (!INBOUNDS_VEC(obj.customplatformtile, graphics.entcolours))
{
continue;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tpoint.x = (edentity[i].x*8)- (ed.levx*40*8);
tpoint.y = (edentity[i].y*8)- (ed.levy*30*8);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
drawRect = graphics.tiles_rect;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
Fix "name lookup of ‘i’ changed" warning in editor.cpp I got this warning during compilation because there were two nested for loops both defining i. Better to have different names to make sure some compilers won't overwrite the outer variable with the inner one.
2020-10-11 22:56:17 +02:00
for (int j = 0; j < 4; j++) {
Fix entities in the Warp Zone's gray tileset not being gray in the editor (#480) In-level, they were made to be gray in #323. The editor does not reflect this however; they're still shown as green. For the same reasons in #323, this adds special cases to draw the entities as gray. Closes #372. Also, I changed my name in contributors.txt to be my username as I didn't feel comfortable with it being my name. Co-authored-by: Misa <ness.of.onett.earthbound@gmail.com>
2020-09-25 19:35:03 +02:00
if (custom_gray) BlitSurfaceTinted(graphics.entcolours[obj.customplatformtile],NULL, graphics.backBuffer, &drawRect, gray_ct);
else BlitSurfaceStandard(graphics.entcolours[obj.customplatformtile],NULL, graphics.backBuffer, &drawRect);
drawRect.x += 8;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(edentity[i].p1<=4)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
if(edentity[i].p1==0) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+12,(edentity[i].y*8)- (ed.levy*30*8), "V", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
if(edentity[i].p1==1) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+12,(edentity[i].y*8)- (ed.levy*30*8), "^", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
if(edentity[i].p1==2) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+12,(edentity[i].y*8)- (ed.levy*30*8), "<", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
if(edentity[i].p1==3) graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+12,(edentity[i].y*8)- (ed.levy*30*8), ">", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),32,8,graphics.getBGR(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(edentity[i].p1==5)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8), ">>>>", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),32,8,graphics.getBGR(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(edentity[i].p1==6)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8), "<<<<", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),32,8,graphics.getBGR(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(edentity[i].p1>=7)
{
tpoint.x = (edentity[i].x*8)- (ed.levx*40*8)+32;
tpoint.y = (edentity[i].y*8)- (ed.levy*30*8);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
drawRect = graphics.tiles_rect;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
Fix "name lookup of ‘i’ changed" warning in editor.cpp I got this warning during compilation because there were two nested for loops both defining i. Better to have different names to make sure some compilers won't overwrite the outer variable with the inner one.
2020-10-11 22:56:17 +02:00
for (int j = 0; j < 4; j++) {
Fix entities in the Warp Zone's gray tileset not being gray in the editor (#480) In-level, they were made to be gray in #323. The editor does not reflect this however; they're still shown as green. For the same reasons in #323, this adds special cases to draw the entities as gray. Closes #372. Also, I changed my name in contributors.txt to be my username as I didn't feel comfortable with it being my name. Co-authored-by: Misa <ness.of.onett.earthbound@gmail.com>
2020-09-25 19:35:03 +02:00
if (custom_gray) BlitSurfaceTinted(graphics.entcolours[obj.customplatformtile],NULL, graphics.backBuffer, &drawRect, gray_ct);
else BlitSurfaceStandard(graphics.entcolours[obj.customplatformtile],NULL, graphics.backBuffer, &drawRect);
drawRect.x += 8;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(edentity[i].p1==7)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+4,(edentity[i].y*8)- (ed.levy*30*8), "> > > > ", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),64,8,graphics.getBGR(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(edentity[i].p1==8)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((edentity[i].x*8)- (ed.levx*40*8)+4,(edentity[i].y*8)- (ed.levy*30*8), "< < < < ", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),64,8,graphics.getBGR(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 3: //Disappearing Platform
Add bounds-check to entcolours in editor rendering I have no idea why neither conveyors and moving and disappearing platforms rendered in the editor or in-game use Graphics::drawentcolours(), but this needs to be bounds-checked just as I did for the in-game rendering function.
2020-09-16 00:21:34 +02:00
if (!INBOUNDS_VEC(obj.customplatformtile, graphics.entcolours))
{
continue;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
tpoint.x = (edentity[i].x*8)- (ed.levx*40*8);
tpoint.y = (edentity[i].y*8)- (ed.levy*30*8);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
drawRect = graphics.tiles_rect;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
Fix "name lookup of ‘i’ changed" warning in editor.cpp I got this warning during compilation because there were two nested for loops both defining i. Better to have different names to make sure some compilers won't overwrite the outer variable with the inner one.
2020-10-11 22:56:17 +02:00
for (int j = 0; j < 4; j++) {
Fix entities in the Warp Zone's gray tileset not being gray in the editor (#480) In-level, they were made to be gray in #323. The editor does not reflect this however; they're still shown as green. For the same reasons in #323, this adds special cases to draw the entities as gray. Closes #372. Also, I changed my name in contributors.txt to be my username as I didn't feel comfortable with it being my name. Co-authored-by: Misa <ness.of.onett.earthbound@gmail.com>
2020-09-25 19:35:03 +02:00
if (custom_gray) BlitSurfaceTinted(graphics.entcolours[obj.customplatformtile],NULL, graphics.backBuffer, &drawRect, gray_ct);
else BlitSurfaceStandard(graphics.entcolours[obj.customplatformtile],NULL, graphics.backBuffer, &drawRect);
drawRect.x += 8;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8), "////", 255 - help.glow, 255 - help.glow, 255 - help.glow, false);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),32,8,graphics.getBGR(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 9: //Shiny Trinket
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),22,196,196,196);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,16,graphics.getRGB(164,164,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 10: //Checkpoints
Improve support for retextured checkpoints and terminals in the editor Retextured checkpoints have always been in the game, but clicking on them in the editor would lead to them losing their retextured-ness. So, checkpoints should be left alone if their p1 isn't either 0 or 1. Also, they don't show up properly in the editor, so that's fixed, too. Retextured and flipped terminals were added in 2.3, and show up properly in-game, but don't properly show up in the editor, either. So now they show up in the editor. Additionally, clicking on them will flip the terminal as well, but only if its p1 is 0 or 1, just like checkpoints now do.
2021-01-12 02:19:20 +01:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),20 + edentity[i].p1,196,196,196);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,16,graphics.getRGB(164,164,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 11: //Gravity lines
if(edentity[i].p1==0) //Horizontal
{
Move gravity line correction to editorrenderfixed Gravity line correction no longer happens on every deltaframe. This means less CPU time is wasted. Although, there's probably no need to correct gravity lines on every single frame... hm... well, that's an optimization for later (there's plenty of other stuff to cache, like minimap drawing or editor foreground drawing).
2021-03-10 00:36:05 +01:00
int tx = edentity[i].p2;
int tx2 = tx + edentity[i].p3/8;
int ty = edentity[i].y % 30;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, (tx*8),(ty*8)+4, (tx2-tx)*8,1, graphics.getRGB(194,194,194));
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(164,255,164));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else //Vertical
{
Move gravity line correction to editorrenderfixed Gravity line correction no longer happens on every deltaframe. This means less CPU time is wasted. Although, there's probably no need to correct gravity lines on every single frame... hm... well, that's an optimization for later (there's plenty of other stuff to cache, like minimap drawing or editor foreground drawing).
2021-03-10 00:36:05 +01:00
int tx = edentity[i].x % 40;
int ty = edentity[i].p2;
int ty2 = ty + edentity[i].p3/8;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, (tx*8)+3,(ty*8), 1,(ty2-ty)*8, graphics.getRGB(194,194,194));
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(164,255,164));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 13://Warp tokens
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),18+(ed.entframe%2),196,196,196);
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,16,graphics.getRGB(164,164,255));
Move temp variable off of editorclass Again, basically no reason for it to exist on the class itself. The usage of the variable was replaced with temp2 instead of temp because there was already a temp variable in the function it was used in.
2020-07-03 04:28:35 +02:00
if(temp2==i)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
"("+help.String(((edentity[i].p1-int(edentity[i].p1%40))/40)+1)+","+help.String(((edentity[i].p2-int(edentity[i].p2%30))/30)+1)+")",210,210,255);
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,help.String(ed.findwarptoken(i)),210,210,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 15: //Crewmates
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8)-4,(edentity[i].y*8)- (ed.levy*30*8),144,graphics.crewcolourreal(edentity[i].p1));
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,graphics.getRGB(164,164,164));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 16: //Start
if(edentity[i].p1==0) //Left
{
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8)-4,(edentity[i].y*8)- (ed.levy*30*8),0,graphics.col_crewcyan);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(edentity[i].p1==1)
{
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8)-4,(edentity[i].y*8)- (ed.levy*30*8),3,graphics.col_crewcyan);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,graphics.getRGB(164,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(ed.entframe<2)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].x*8)- (ed.levx*40*8)-12,(edentity[i].y*8)- (ed.levy*30*8)-8,"START",255,255,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].x*8)- (ed.levx*40*8)-12,(edentity[i].y*8)- (ed.levy*30*8)-8,"START",196,196,196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 17: //Roomtext
if(edentity[i].scriptname.length()<1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(96,96,96));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Add support for Unicode rendering (#47) This uses utfcpp combined with a custom font, in the form of a PNG and text file. By default, the game acts exactly as it did before; custom fonts can be provided by third parties.
2020-01-31 19:25:37 +01:00
int length = utf8::unchecked::distance(edentity[i].scriptname.begin(), edentity[i].scriptname.end());
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),length*8,8,graphics.getRGB(96,96,96));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8), edentity[i].scriptname, 196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 18: //Terminals
Improve support for retextured checkpoints and terminals in the editor Retextured checkpoints have always been in the game, but clicking on them in the editor would lead to them losing their retextured-ness. So, checkpoints should be left alone if their p1 isn't either 0 or 1. Also, they don't show up properly in the editor, so that's fixed, too. Retextured and flipped terminals were added in 2.3, and show up properly in-game, but don't properly show up in the editor, either. So now they show up in the editor. Additionally, clicking on them will flip the terminal as well, but only if its p1 is 0 or 1, just like checkpoints now do.
2021-01-12 02:19:20 +01:00
{
int usethistile = edentity[i].p1;
int usethisy = (edentity[i].y % 30) * 8;
// Not a boolean: just swapping 0 and 1, leaving the rest alone
if (usethistile == 0)
{
usethistile = 1; // Unflipped
}
else if (usethistile == 1)
{
usethistile = 0; // Flipped;
usethisy -= 8;
}
graphics.drawsprite((edentity[i].x*8)- (ed.levx*40*8), usethisy + 8, usethistile + 16, 96,96,96);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),16,24,graphics.getRGB(164,164,164));
Move temp variable off of editorclass Again, basically no reason for it to exist on the class itself. The usage of the variable was replaced with temp2 instead of temp because there was already a temp variable in the function it was used in.
2020-07-03 04:28:35 +02:00
if(temp2==i)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,edentity[i].scriptname,210,210,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
Improve support for retextured checkpoints and terminals in the editor Retextured checkpoints have always been in the game, but clicking on them in the editor would lead to them losing their retextured-ness. So, checkpoints should be left alone if their p1 isn't either 0 or 1. Also, they don't show up properly in the editor, so that's fixed, too. Retextured and flipped terminals were added in 2.3, and show up properly in-game, but don't properly show up in the editor, either. So now they show up in the editor. Additionally, clicking on them will flip the terminal as well, but only if its p1 is 0 or 1, just like checkpoints now do.
2021-01-12 02:19:20 +01:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
case 19: //Script Triggers
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),edentity[i].p1*8,edentity[i].p2*8,graphics.getRGB(255,164,255));
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(255,255,255));
Move temp variable off of editorclass Again, basically no reason for it to exist on the class itself. The usage of the variable was replaced with temp2 instead of temp because there was already a temp variable in the function it was used in.
2020-07-03 04:28:35 +02:00
if(temp2==i)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8)-8,edentity[i].scriptname,210,210,255);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 50: //Warp lines
if(edentity[i].p1>=2) //Horizontal
{
int tx=edentity[i].x-(ed.levx*40);
int tx2=edentity[i].x-(ed.levx*40);
int ty=edentity[i].y-(ed.levy*30);
Adhere to "locked" gravity/warp lines Ved has this useful feature where you can "lock" a gravity line or warp line in place, meaning it'll no longer extend its length until it touches a tile. A line is locked if the p4 of the edentity is 1. VVVVVV doesn't support this, but now it does. The horrifying thing is that it stretches the lines out *while rendering the line*, so it looks like logic and rendering aren't that separate after all (although, I already learned that when I did my over-30-FPS patch).
2020-06-30 23:42:34 +02:00
if (edentity[i].p4 != 1)
{
// Unlocked
while(ed.free(tx,ty)==0) tx--;
while(ed.free(tx2,ty)==0) tx2++;
tx++;
edentity[i].p2=tx;
edentity[i].p3=(tx2-tx)*8;
}
else
{
// Locked
tx = edentity[i].p2;
tx2 = tx + edentity[i].p3/8;
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((tx*8),(ty*8)+1, (tx2-tx)*8,6, graphics.getRGB(255,255,194));
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(255,255,164));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else //Vertical
{
int tx=edentity[i].x-(ed.levx*40);
int ty=edentity[i].y-(ed.levy*30);
int ty2=edentity[i].y-(ed.levy*30);
Adhere to "locked" gravity/warp lines Ved has this useful feature where you can "lock" a gravity line or warp line in place, meaning it'll no longer extend its length until it touches a tile. A line is locked if the p4 of the edentity is 1. VVVVVV doesn't support this, but now it does. The horrifying thing is that it stretches the lines out *while rendering the line*, so it looks like logic and rendering aren't that separate after all (although, I already learned that when I did my over-30-FPS patch).
2020-06-30 23:42:34 +02:00
if (edentity[i].p4 != 1)
{
// Unlocked
while(ed.free(tx,ty)==0) ty--;
while(ed.free(tx,ty2)==0) ty2++;
ty++;
edentity[i].p2=ty;
edentity[i].p3=(ty2-ty)*8;
}
else
{
// Locked
ty = edentity[i].p2;
ty2 = ty + edentity[i].p3/8;
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((tx*8)+1,(ty*8), 6,(ty2-ty)*8, graphics.getRGB(255,255,194));
fillboxabs((edentity[i].x*8)- (ed.levx*40*8),(edentity[i].y*8)- (ed.levy*30*8),8,8,graphics.getRGB(255,255,164));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
}
}
//Need to also check warp point destinations
if(edentity[i].t==13 && ed.warpent!=i)
{
Fix edentities not rendering at all in the editor What's the difference between a slash sign and a percent sign? Well, a percent sign is just a slash sign with two extra oranges in between, but those two oranges make a huuuuge difference...
2020-11-08 02:12:54 +01:00
if (edentity[i].p1 / 40 == ed.levx && edentity[i].p2 / 30 == ed.levy)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8),18+(ed.entframe%2),64,64,64);
fillboxabs((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8),16,16,graphics.getRGB(64,64,96));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(ed.tilex+(ed.levx*40)==edentity[i].p1 && ed.tiley+(ed.levy*30)==edentity[i].p2)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8)-8,
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
"("+help.String(((edentity[i].x-int(edentity[i].x%40))/40)+1)+","+help.String(((edentity[i].y-int(edentity[i].y%30))/30)+1)+")",190,190,225);
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint((edentity[i].p1*8)- (ed.levx*40*8),(edentity[i].p2*8)- (ed.levy*30*8)-8,help.String(ed.findwarptoken(i)),190,190,225);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
if(ed.boundarymod>0)
{
if(ed.boundarymod==1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs(ed.tilex*8, ed.tiley*8, 8,8,graphics.getRGB(255-(help.glow/2),191+(help.glow),210+(help.glow/2)));
fillboxabs((ed.tilex*8)+2, (ed.tiley*8)+2, 4,4,graphics.getRGB(128-(help.glow/4),100+(help.glow/2),105+(help.glow/4)));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(ed.boundarymod==2)
{
if((ed.tilex*8)+8<=ed.boundx1 || (ed.tiley*8)+8<=ed.boundy1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs(ed.boundx1, ed.boundy1, 8, 8,graphics.getRGB(255-(help.glow/2),191+(help.glow),210+(help.glow/2)));
fillboxabs(ed.boundx1+2, ed.boundy1+2, 4, 4,graphics.getRGB(128-(help.glow/4),100+(help.glow/2),105+(help.glow/4)));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs(ed.boundx1, ed.boundy1, (ed.tilex*8)+8-ed.boundx1,(ed.tiley*8)+8-ed.boundy1,graphics.getRGB(255-(help.glow/2),191+(help.glow),210+(help.glow/2)));
fillboxabs(ed.boundx1+2, ed.boundy1+2, (ed.tilex*8)+8-ed.boundx1-4,(ed.tiley*8)+8-ed.boundy1-4,graphics.getRGB(128-(help.glow/4),100+(help.glow/2),105+(help.glow/4)));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
else
{
//Draw boundaries
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->enemyx1!=0 && room->enemyy1!=0
&& room->enemyx2!=320 && room->enemyy2!=240)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
fillboxabs( room->enemyx1, room->enemyy1,
room->enemyx2-room->enemyx1,
room->enemyy2-room->enemyy1,
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.getBGR(255-(help.glow/2),64,64));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->platx1!=0 && room->platy1!=0
&& room->platx2!=320 && room->platy2!=240)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
fillboxabs( room->platx1, room->platy1,
room->platx2-room->platx1,
room->platy2-room->platy1,
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.getBGR(64,64,255-(help.glow/2)));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
//Draw ghosts (spooky!)
if (game.ghostsenabled) {
Change all surface-clearing FillRect()s to use ClearSurface() ClearSurface() is less verbose than doing it the old way, and also conveys intent clearer. Plus, some of these FillRect()s had hardcoded width and height values, whereas ClearSurface() doesn't - meaning this change also has better future-proofing, in case the widths and heights of the surfaces involved change in the future.
2021-02-26 00:37:03 +01:00
ClearSurface(graphics.ghostbuffer);
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
for (int i = 0; i < (int)ed.ghosts.size(); i++) {
if (i <= ed.currentghosts) { // We don't want all of them to show up at once :)
Fix indexing out-of-bounds via an entity's drawframe I tracked down all the functions that took in an entity's drawframe and made sure that no matter what value an entity's drawframe was, the game would never segfault.
2020-06-14 03:35:12 +02:00
if (ed.ghosts[i].rx != ed.levx || ed.ghosts[i].ry != ed.levy
Rename INBOUNDS() macro to INBOUNDS_VEC() Since there's an INBOUNDS_ARR() macro, it's much better to specify the macro for the vector is a macro for the vector, to avoid confusion. All usages of this macro have been renamed accordingly.
2020-09-08 09:31:44 +02:00
|| !INBOUNDS_VEC(ed.ghosts[i].frame, graphics.sprites))
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
continue;
point tpoint;
tpoint.x = ed.ghosts[i].x;
tpoint.y = ed.ghosts[i].y;
Fix editor ghost colors updating too fast Like actual entities, editor ghost colors were updating every render frame instead of logic frame. So just like actual entities, I added a realcol attribute to them that editorrender() uses instead, and added code to update said realcol attribute in editorlogic(). That way the colors don't go by too quickly (especially the death color).
2020-06-13 02:34:19 +02:00
graphics.setcolreal(ed.ghosts[i].realcol);
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
Uint32 alpha = graphics.ct.colour & graphics.backBuffer->format->Amask;
Uint32 therest = graphics.ct.colour & 0x00FFFFFF;
alpha = (3 * (alpha >> 24) / 4) << 24;
graphics.ct.colour = therest | alpha;
SDL_Rect drawRect = graphics.sprites_rect;
drawRect.x += tpoint.x;
drawRect.y += tpoint.y;
BlitSurfaceColoured(graphics.sprites[ed.ghosts[i].frame],NULL, graphics.ghostbuffer, &drawRect, graphics.ct);
}
}
SDL_BlitSurface(graphics.ghostbuffer, NULL, graphics.backBuffer, &graphics.bg_rect);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Draw Cursor
switch(ed.drawmode)
{
case 0:
case 1:
case 2:
case 9:
case 10:
case 12: //Single point
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((ed.tilex*8),(ed.tiley*8),8,8, graphics.getRGB(200,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
case 4:
case 8:
case 13://2x2
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((ed.tilex*8),(ed.tiley*8),16,16, graphics.getRGB(200,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
case 6:
case 7://Platform
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((ed.tilex*8),(ed.tiley*8),32,8, graphics.getRGB(200,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 14: //X if not on edge
if(ed.tilex==0 || ed.tilex==39 || ed.tiley==0 || ed.tiley==29)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((ed.tilex*8),(ed.tiley*8),8,8, graphics.getRGB(200,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print((ed.tilex*8),(ed.tiley*8),"X",255,0,0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 11:
case 15:
case 16: //2x3
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs((ed.tilex*8),(ed.tiley*8),16,24, graphics.getRGB(200,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
if(ed.drawmode<3)
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
if(ed.bmod && ed.drawmode<2)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
fillboxabs((ed.tilex*8),0,8,240,graphics.getRGB(200,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.hmod && ed.drawmode<2)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
fillboxabs(0,(ed.tiley*8),320,8,graphics.getRGB(200,32,32));
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
else if(ed.vmod && ed.drawmode<2)
{
fillboxabs((ed.tilex*8)-32,(ed.tiley*8)-32,24+48,24+48, graphics.getRGB(200,32,32));
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.cmod && ed.drawmode<2)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
fillboxabs((ed.tilex*8)-24,(ed.tiley*8)-24,24+32,24+32, graphics.getRGB(200,32,32));
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.xmod && ed.drawmode<2)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
fillboxabs((ed.tilex*8)-16,(ed.tiley*8)-16,24+16,24+16, graphics.getRGB(200,32,32));
}
else if(ed.zmod && ed.drawmode<2)
{
fillboxabs((ed.tilex*8)-8,(ed.tiley*8)-8,24,24, graphics.getRGB(200,32,32));
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
//If in directmode, show current directmode tile
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->directmode==1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Tile box for direct mode
int t2=0;
if(ed.dmtileeditor>0)
{
if(ed.dmtileeditor<=4)
{
Interpolate Direct Mode drawer closing This is pretty simple to interpolate, since ed.dmtileeditor is guaranteed to have only changed by 1, and then it's just multiplied by 4.
2021-03-10 00:42:55 +01:00
t2=graphics.lerp((4-ed.dmtileeditor+1)*12, (4-ed.dmtileeditor)*12);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
//Draw five lines of the editor
temp=ed.dmtile-(ed.dmtile%40);
temp-=80;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,-t2,320,40, graphics.getRGB(0,0,0));
FillRect(graphics.backBuffer, 0,-t2+40,320,2, graphics.getRGB(255,255,255));
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->tileset==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for(int i=0; i<40; i++)
{
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(i*8,0-t2,(temp+1200+i)%1200);
graphics.drawtile(i*8,8-t2,(temp+1200+40+i)%1200);
graphics.drawtile(i*8,16-t2,(temp+1200+80+i)%1200);
graphics.drawtile(i*8,24-t2,(temp+1200+120+i)%1200);
graphics.drawtile(i*8,32-t2,(temp+1200+160+i)%1200);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else
{
for(int i=0; i<40; i++)
{
Remove unused arguments from Graphics::drawtile2() The 'r', 'g', and 'b' arguments do absolutely nothing. Except unlike Graphics::drawtile(), there's only one version of Graphics::drawtile2(), so just remove those args and update callers.
2020-04-02 00:47:35 +02:00
graphics.drawtile2(i*8,0-t2,(temp+1200+i)%1200);
graphics.drawtile2(i*8,8-t2,(temp+1200+40+i)%1200);
graphics.drawtile2(i*8,16-t2,(temp+1200+80+i)%1200);
graphics.drawtile2(i*8,24-t2,(temp+1200+120+i)%1200);
graphics.drawtile2(i*8,32-t2,(temp+1200+160+i)%1200);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
//Highlight our little block
Fix Direct Mode selection square not moving with tile selection drawer Closes TerryCavanagh#386.
2020-08-01 22:27:03 +02:00
fillboxabs(((ed.dmtile%40)*8)-2,16-t2-2,12,12,graphics.getRGB(196, 196, 255 - help.glow));
fillboxabs(((ed.dmtile%40)*8)-1,16-t2-1,10,10,graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(ed.dmtileeditor>0 && t2<=30)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2, 45-t2, "Tile:", 196, 196, 255 - help.glow, false);
graphics.bprint(58, 45-t2, help.String(ed.dmtile), 196, 196, 255 - help.glow, false);
FillRect(graphics.backBuffer, 44,44-t2,10,10, graphics.getRGB(196, 196, 255 - help.glow));
FillRect(graphics.backBuffer, 45,45-t2,8,8, graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->tileset==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(45,45-t2,ed.dmtile);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove unused arguments from Graphics::drawtile2() The 'r', 'g', and 'b' arguments do absolutely nothing. Except unlike Graphics::drawtile(), there's only one version of Graphics::drawtile2(), so just remove those args and update callers.
2020-04-02 00:47:35 +02:00
graphics.drawtile2(45,45-t2,ed.dmtile);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2, 12, "Tile:", 196, 196, 255 - help.glow, false);
graphics.bprint(58, 12, help.String(ed.dmtile), 196, 196, 255 - help.glow, false);
FillRect(graphics.backBuffer, 44,11,10,10, graphics.getRGB(196, 196, 255 - help.glow));
FillRect(graphics.backBuffer, 45,12,8,8, graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->tileset==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(45,12,ed.dmtile);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove unused arguments from Graphics::drawtile2() The 'r', 'g', and 'b' arguments do absolutely nothing. Except unlike Graphics::drawtile(), there's only one version of Graphics::drawtile2(), so just remove those args and update callers.
2020-04-02 00:47:35 +02:00
graphics.drawtile2(45,12,ed.dmtile);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
//Draw GUI
if(ed.boundarymod>0)
{
if(ed.boundarymod==1)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,230,320,240, graphics.getRGB(32,32,32));
FillRect(graphics.backBuffer, 0,231,320,240, graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(ed.boundarytype)
{
case 0:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "SCRIPT BOX: Click on top left", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "ENEMY BOUNDS: Click on top left", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "PLATFORM BOUNDS: Click on top left", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "COPY TILES: Click on top left", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
default:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "Click on top left", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
else if(ed.boundarymod==2)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,230,320,240, graphics.getRGB(32,32,32));
FillRect(graphics.backBuffer, 0,231,320,240, graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(ed.boundarytype)
{
case 0:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "SCRIPT BOX: Click on bottom right", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "ENEMY BOUNDS: Click on bottom right", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "PLATFORM BOUNDS: Click on bottom right", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "COPY TILES: Click on bottom right", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
default:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "Click on bottom right", 255,255,255, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
}
else if(ed.scripteditmod)
{
//Elaborate C64 BASIC menu goes here!
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,0,320,240, graphics.getBGR(123, 111, 218));
FillRect(graphics.backBuffer, 14,16,292,208, graphics.getRGB(162,48,61));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(ed.scripthelppage)
{
case 0:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(16,28,"**** VVVVVV SCRIPT EDITOR ****", 123, 111, 218, true);
graphics.Print(16,44,"PRESS ESC TO RETURN TO MENU", 123, 111, 218, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(!ed.hooklist.empty())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for(int i=0; i<9; i++)
{
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(ed.hookmenupage+i<(int)ed.hooklist.size())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(ed.hookmenupage+i==ed.hookmenu)
{
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
std::string tstring="> " + ed.hooklist[(ed.hooklist.size()-1)-(ed.hookmenupage+i)] + " <";
Remove use of std::transform(), use SDL_toupper/lower There's no need to use a template here. Just manually call SDL_tolower() or SDL_toupper() as needed. Oh yeah, and use SDL_tolower() and SDL_toupper() instead of libc tolower() and toupper().
2020-07-03 23:54:23 +02:00
for (size_t ii = 0; ii < tstring.length(); ii++)
{
tstring[ii] = SDL_toupper(tstring[ii]);
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(16,68+(i*16),tstring,123, 111, 218, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(16,68+(i*16),ed.hooklist[(ed.hooklist.size()-1)-(ed.hookmenupage+i)],123, 111, 218, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(16,110,"NO SCRIPT IDS FOUND", 123, 111, 218, true);
graphics.Print(16,130,"CREATE A SCRIPT WITH EITHER", 123, 111, 218, true);
graphics.Print(16,140,"THE TERMINAL OR SCRIPT BOX TOOLS", 123, 111, 218, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
case 1:
//Current scriptname
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 14,226,292,12, graphics.getRGB(162,48,61));
graphics.Print(16,228,"CURRENT SCRIPT: " + ed.sbscript, 123, 111, 218, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Draw text
for(int i=0; i<25; i++)
{
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(i+ed.pagey<(int)ed.sb.size())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(16,20+(i*8),ed.sb[i+ed.pagey], 123, 111, 218, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
//Draw cursor
if(ed.entframe<2)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(16+(ed.sbx*8),20+(ed.sby*8),"_",123, 111, 218, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
break;
}
}
else if(ed.settingsmod)
{
Fix editor menu being drawn on top of editor with BGs disabled Previously, if you had backgrounds disabled in accessibility options, and went to the editor and opened up the editor menu, it would be drawn straight on top of what was already there in the editor instead of being drawn on top of black. So now it's drawn on top of black.
2020-04-29 20:15:23 +02:00
if(!game.colourblindmode)
{
Move title usages of towerbg to titlebg With the previous commit in place, we can now simply move some usages of the previous towerbg to use a separate object instead. That way, we don't have to mess with a monolithic state, or some better way to phrase what I just said, and we instead have two separate objects that can coexist side-by-side.
2020-11-03 00:23:53 +01:00
graphics.drawtowerbackground(graphics.titlebg);
Fix editor menu being drawn on top of editor with BGs disabled Previously, if you had backgrounds disabled in accessibility options, and went to the editor and opened up the editor menu, it would be drawn straight on top of what was already there in the editor instead of being drawn on top of black. So now it's drawn on top of black.
2020-04-29 20:15:23 +02:00
}
else
{
Change all surface-clearing FillRect()s to use ClearSurface() ClearSurface() is less verbose than doing it the old way, and also conveys intent clearer. Plus, some of these FillRect()s had hardcoded width and height values, whereas ClearSurface() doesn't - meaning this change also has better future-proofing, in case the widths and heights of the surfaces involved change in the future.
2021-02-26 00:37:03 +01:00
ClearSurface(graphics.backBuffer);
Fix editor menu being drawn on top of editor with BGs disabled Previously, if you had backgrounds disabled in accessibility options, and went to the editor and opened up the editor menu, it would be drawn straight on top of what was already there in the editor instead of being drawn on top of black. So now it's drawn on top of black.
2020-04-29 20:15:23 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Move mapclass r/g/b variables off onto TowerBG This fixes a bug where if you entered a tower before watching the credits sequence, the credits sequence would have mismatched text and background colors. This bug happened because entering a tower modified the r/g/b attributes of mapclass, and updated graphics.towerbg, without updating graphics.titlebg too. Then gamecompleterender() uses the r/g/b attributes of mapclass. The solution is to put the r/g/b attributes on TowerBG instead. That way, entering a tower will only modify the r/g/b attributes used to render towers, and won't affect the r/g/b attributes used to render the credits sequence. Additionally, I also de-duplicated the case-switch that updated the r/g/b attributes based off of the current colstate, because it got copy-pasted twice, leading to three instances of one piece of code.
2021-01-08 02:37:38 +01:00
int tr = graphics.titlebg.r - (help.glow / 4) - int(fRandom() * 4);
int tg = graphics.titlebg.g - (help.glow / 4) - int(fRandom() * 4);
int tb = graphics.titlebg.b - (help.glow / 4) - int(fRandom() * 4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (tr < 0) tr = 0;
if(tr>255) tr=255;
if (tg < 0) tg = 0;
if(tg>255) tg=255;
if (tb < 0) tb = 0;
if(tb>255) tb=255;
Move editor menu option rendering to separate function Just like before, it makes editorrender() easier to read and reduces the indentation level of the option rendering by one level.
2020-04-16 05:55:34 +02:00
editormenurender(tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Make menus automatically centered and narrowed All menus had a hardcoded X position (offset to an arbitrary starting point of 110) and a hardcoded horizontal spacing for the "staircasing" (mostly 30 pixels, but for some specific menus hardcoded to 15, 20 or something else). Not all menus were centered, and seem to have been manually made narrower (with lower horizontal spacing) whenever text ran offscreen during development. This system may already be hard to work with in an English-only menu system, since you may need to adjust horizontal spacing or positioning when adding an option. The main reason I made this change is that it's even less optimal when menu options have to be translated, since maximum string lengths are hard to determine, and it's easy to have menu options running offscreen, especially when not all menus are checked for all languages and when options could be added in the middle of a menu after translations of that menu are already checked. Now, menus are automatically centered based on their options, and they are automatically made narrower if they won't fit with the default horizontal spacing of 30 pixels (with some padding). The game.menuxoff variable for the menu X position is now also offset to 0 instead of 110 The _default_ horizontal spacing can be changed on a per-menu basis, and most menus (not all) which already had a narrower spacing set, retain that as a maximum spacing, simply because they looked odd with 30 pixels of spacing (especially the main menu). They will be made even narrower automatically if needed. In the most extreme case, the spacing can go down to 0 and options will be displayed right below each other. This isn't in the usual style of the game, but at least we did the best we could to prevent options running offscreen. The only exception to automatic menu centering and narrowing is the list of player levels, because it's a special case and existing behavior would be better than automatic centering there.
2020-06-29 02:09:52 +02:00
graphics.drawmenu(tr, tg, tb);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
else if (ed.textmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
FillRect(graphics.backBuffer, 0, 221, 320, 240, graphics.getRGB(32, 32, 32));
FillRect(graphics.backBuffer, 0, 222, 320, 240, graphics.getRGB(0, 0, 0));
graphics.Print(4, 224, ed.textdesc, 255, 255, 255, false);
std::string input = key.keybuffer;
if (ed.entframe < 2)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
input += "_";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
input += " ";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
graphics.Print(4, 232, input, 196, 196, 255 - help.glow, true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(ed.warpmod)
{
//placing warp token
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,221,320,240, graphics.getRGB(32,32,32));
FillRect(graphics.backBuffer, 0,222,320,240, graphics.getRGB(0,0,0));
graphics.Print(4, 224, "Left click to place warp destination", 196, 196, 255 - help.glow, false);
graphics.Print(4, 232, "Right click to cancel", 196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
if(ed.spacemod)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,208,320,240, graphics.getRGB(32,32,32));
FillRect(graphics.backBuffer, 0,209,320,240, graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Draw little icons for each thingy
int tx=6, ty=211, tg=32;
if(ed.spacemenu==0)
{
for(int i=0; i<10; i++)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 4+(i*tg), 209,20,20,graphics.getRGB(32,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 4+(ed.drawmode*tg), 209,20,20,graphics.getRGB(64,64,64));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//0:
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(tx,ty,83);
graphics.drawtile(tx+8,ty,83);
graphics.drawtile(tx,ty+8,83);
graphics.drawtile(tx+8,ty+8,83);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//1:
tx+=tg;
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(tx,ty,680);
graphics.drawtile(tx+8,ty,680);
graphics.drawtile(tx,ty+8,680);
graphics.drawtile(tx+8,ty+8,680);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//2:
tx+=tg;
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(tx+4,ty+4,8);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//3:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite(tx,ty,22,196,196,196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//4:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite(tx,ty,21,196,196,196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//5:
tx+=tg;
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(tx,ty+4,3);
graphics.drawtile(tx+8,ty+4,4);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//6:
tx+=tg;
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(tx,ty+4,24);
graphics.drawtile(tx+8,ty+4,24);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//7:
tx+=tg;
Remove unused arguments from Graphics::drawtile() The 'r', 'g', and 'b' arguments do absolutely nothing, even though they're used in the version of Graphics::drawtile() that's more used. So delete the other version without those extra arguments, and then remove the extra arguments from the remaining version. And then update callers.
2020-04-02 00:42:22 +02:00
graphics.drawtile(tx,ty+4,1);
graphics.drawtile(tx+8,ty+4,1);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//8:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite(tx,ty,78+ed.entframe,196,196,196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//9:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, tx+2,ty+8,12,1,graphics.getRGB(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix editor tool menu inconsistencies This patch de-duplicates the tool drawing code a bit in the menu that gets brought up when you press Space in the level editor, as well as fixes several bugs related to the fact that the original author(s) of the code decided to copy-paste everything. (It was most likely Terry, judging by the distinct lack of whitespace between tokens in the code.) There are two "pages" of tools that get shown when you open the tool menu, according to your currently-selected tool. 1. On the first page, your currently-selected tool gets a brighter outline. However, on the second page, the code to draw the outline over your currently-selected tool is missing. So I've fixed that. 2. On the first page, the glyph indicator next to the tool icon also gets brighter when you have that tool selected. However, on the second page, the code that drew the brighter-colored indicator got ran before the code that drew the normal-colored indicator, so this was never shown. This is also fixed. 3. The glyph indicator of the gravity line tool didn't get brighter when you had it selected, due to its special-cased copy-pasted code drawing its brighter color before drawing its normal color. This has also been fixed. 4. Lastly, the tool menu no longer draws the brighter-colored glyphs on top of the normal-colored glyphs. Instead, the menu will simply draw the brighter-colored glyphs and will not draw the normal-colored glyphs in the first place. This is because double-drawing text like this will look bad if the user has a custom font.png that has translucent pixels, like I do. All of these bugs have been fixed by paying off the technical debt of copy-pasting code.
2021-01-11 06:10:03 +01:00
for (int i = 0; i < 10; i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs(4+(i*tg), 209,20,20,graphics.getRGB(96,96,96));
Fix editor tool menu inconsistencies This patch de-duplicates the tool drawing code a bit in the menu that gets brought up when you press Space in the level editor, as well as fixes several bugs related to the fact that the original author(s) of the code decided to copy-paste everything. (It was most likely Terry, judging by the distinct lack of whitespace between tokens in the code.) There are two "pages" of tools that get shown when you open the tool menu, according to your currently-selected tool. 1. On the first page, your currently-selected tool gets a brighter outline. However, on the second page, the code to draw the outline over your currently-selected tool is missing. So I've fixed that. 2. On the first page, the glyph indicator next to the tool icon also gets brighter when you have that tool selected. However, on the second page, the code that drew the brighter-colored indicator got ran before the code that drew the normal-colored indicator, so this was never shown. This is also fixed. 3. The glyph indicator of the gravity line tool didn't get brighter when you had it selected, due to its special-cased copy-pasted code drawing its brighter color before drawing its normal color. This has also been fixed. 4. Lastly, the tool menu no longer draws the brighter-colored glyphs on top of the normal-colored glyphs. Instead, the menu will simply draw the brighter-colored glyphs and will not draw the normal-colored glyphs in the first place. This is because double-drawing text like this will look bad if the user has a custom font.png that has translucent pixels, like I do. All of these bugs have been fixed by paying off the technical debt of copy-pasting code.
2021-01-11 06:10:03 +01:00
const int col = i == ed.drawmode ? 255 : 164;
const std::string glyph = i == 9 ? "0" : help.String(i + 1);
graphics.Print(22 + i*tg - 4, 225 - 4, glyph, col, col, col, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs(4+(ed.drawmode*tg), 209,20,20,graphics.getRGB(200,200,200));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "1/2", 196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
for(int i=0; i<7; i++)
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 4+(i*tg), 209,20,20,graphics.getRGB(32,32,32));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 4+((ed.drawmode-10)*tg), 209,20,20,graphics.getRGB(64,64,64));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//10:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(tx,ty,"A",196, 196, 255 - help.glow, false);
graphics.Print(tx+8,ty,"B",196, 196, 255 - help.glow, false);
graphics.Print(tx,ty+8,"C",196, 196, 255 - help.glow, false);
graphics.Print(tx+8,ty+8,"D",196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//11:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite(tx,ty,17,196,196,196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//12:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
fillboxabs(tx+4,ty+4,8,8,graphics.getRGB(96,96,96));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//13:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawsprite(tx,ty,18+(ed.entframe%2),196,196,196);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//14:
tx+=tg;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, tx+6,ty+2,4,12,graphics.getRGB(255,255,255));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//15:
tx+=tg;
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
graphics.drawsprite(tx,ty,186,graphics.col_crewblue);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//16:
tx+=tg;
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
graphics.drawsprite(tx,ty,184,graphics.col_crewcyan);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
Fix editor tool menu inconsistencies This patch de-duplicates the tool drawing code a bit in the menu that gets brought up when you press Space in the level editor, as well as fixes several bugs related to the fact that the original author(s) of the code decided to copy-paste everything. (It was most likely Terry, judging by the distinct lack of whitespace between tokens in the code.) There are two "pages" of tools that get shown when you open the tool menu, according to your currently-selected tool. 1. On the first page, your currently-selected tool gets a brighter outline. However, on the second page, the code to draw the outline over your currently-selected tool is missing. So I've fixed that. 2. On the first page, the glyph indicator next to the tool icon also gets brighter when you have that tool selected. However, on the second page, the code that drew the brighter-colored indicator got ran before the code that drew the normal-colored indicator, so this was never shown. This is also fixed. 3. The glyph indicator of the gravity line tool didn't get brighter when you had it selected, due to its special-cased copy-pasted code drawing its brighter color before drawing its normal color. This has also been fixed. 4. Lastly, the tool menu no longer draws the brighter-colored glyphs on top of the normal-colored glyphs. Instead, the menu will simply draw the brighter-colored glyphs and will not draw the normal-colored glyphs in the first place. This is because double-drawing text like this will look bad if the user has a custom font.png that has translucent pixels, like I do. All of these bugs have been fixed by paying off the technical debt of copy-pasting code.
2021-01-11 06:10:03 +01:00
for (int i = 0; i < 7; i++)
{
fillboxabs(4 + i*tg, 209, 20, 20, graphics.getRGB(96, 96, 96));
const int col = i + 10 == ed.drawmode ? 255 : 164;
static const char glyphs[] = "RTYUIOP";
graphics.Print(22 + i*tg - 4, 225 - 4, std::string(1, glyphs[i]), col, col, col, false);
}
fillboxabs(4 + (ed.drawmode - 10) * tg, 209, 20, 20, graphics.getRGB(200, 200, 200));
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 232, "2/2", 196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(128, 232, "< and > keys change tool", 196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,198,120,10, graphics.getRGB(32,32,32));
FillRect(graphics.backBuffer, 0,199,119,9, graphics.getRGB(0,0,0));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(ed.drawmode)
{
case 0:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "1: Walls",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "2: Backing",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "3: Spikes",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "4: Trinkets",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "5: Checkpoint",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "6: Disappear",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "7: Conveyors",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 7:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "8: Moving",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 8:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "9: Enemies",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 9:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "0: Grav Line",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 10:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "R: Roomtext",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 11:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "T: Terminal",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 12:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "Y: Script Box",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 13:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "U: Warp Token",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 14:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "I: Warp Lines",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 15:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "O: Crewmate",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 16:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,199, "P: Start Point",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 260,198,80,10, graphics.getRGB(32,32,32));
FillRect(graphics.backBuffer, 261,199,80,9, graphics.getRGB(0,0,0));
graphics.bprint(268,199, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
//FillRect(graphics.backBuffer, 0,230,72,240, graphics.RGB(32,32,32));
//FillRect(graphics.backBuffer, 0,231,71,240, graphics.RGB(0,0,0));
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(room->roomname!="")
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
if (graphics.translucentroomname)
Add an accessibility option to be able to see through the roomname This is the variable dwgfx.translucentroomname and <translucentroomname> in unlock.vvv. This lets you see through the black background of the roomname at the bottom of the screen, i.e. it makes the roomname background translucent. So you can see if someone decides to hide pesky spikes there.
2020-01-25 05:43:04 +01:00
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.footerrect.y = 230+ed.roomnamehide;
SDL_BlitSurface(graphics.footerbuffer, NULL, graphics.backBuffer, &graphics.footerrect);
Add an accessibility option to be able to see through the roomname This is the variable dwgfx.translucentroomname and <translucentroomname> in unlock.vvv. This lets you see through the black background of the roomname at the bottom of the screen, i.e. it makes the roomname background translucent. So you can see if someone decides to hide pesky spikes there.
2020-01-25 05:43:04 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,230+ed.roomnamehide,320,10, graphics.getRGB(0,0,0));
Add an accessibility option to be able to see through the roomname This is the variable dwgfx.translucentroomname and <translucentroomname> in unlock.vvv. This lets you see through the black background of the roomname at the bottom of the screen, i.e. it makes the roomname background translucent. So you can see if someone decides to hide pesky spikes there.
2020-01-25 05:43:04 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
graphics.bprint(5,231+ed.roomnamehide,room->roomname, 196, 196, 255 - help.glow, true);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(4, 222, "SPACE ^ SHIFT ^", 196, 196, 255 - help.glow, false);
graphics.bprint(268,222, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(4, 232, "SPACE ^ SHIFT ^", 196, 196, 255 - help.glow, false);
graphics.bprint(268,232, "("+help.String(ed.levx+1)+","+help.String(ed.levy+1)+")",196, 196, 255 - help.glow, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if(ed.shiftmenu)
{
Add F9 "reload resources" hotkey to list of hotkeys in Shift menu 2.3's per-level assets feature also added a hotkey to reload the custom assets of the level you're currently editing in the editor, so you wouldn't have to re-load the level yourself. This hotkey is F9, but however, it hasn't been documented in the hotkey list brought up by pressing Shift, until now.
2021-01-11 05:26:21 +01:00
fillboxabs(0, 117,171+8,140,graphics.getRGB(64,64,64));
FillRect(graphics.backBuffer, 0,118,170+8,140, graphics.getRGB(0,0,0));
graphics.Print(4, 120, "F1: Change Tileset",164,164,164,false);
graphics.Print(4, 130, "F2: Change Colour",164,164,164,false);
graphics.Print(4, 140, "F3: Change Enemies",164,164,164,false);
graphics.Print(4, 150, "F4: Enemy Bounds",164,164,164,false);
graphics.Print(4, 160, "F5: Platform Bounds",164,164,164,false);
graphics.Print(4, 180, "F9: Reload Resources",164,164,164,false);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.Print(4, 190, "F10: Direct Mode",164,164,164,false);
graphics.Print(4, 210, "W: Change Warp Dir",164,164,164,false);
graphics.Print(4, 220, "E: Change Roomname",164,164,164,false);
fillboxabs(220, 207,100,60,graphics.getRGB(64,64,64));
FillRect(graphics.backBuffer, 221,208,160,60, graphics.getRGB(0,0,0));
graphics.Print(224, 210, "S: Save Map",164,164,164,false);
graphics.Print(224, 220, "L: Load Map",164,164,164,false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if(!ed.settingsmod && !ed.scripteditmod)
{
//Same as above, without borders
switch(ed.drawmode)
{
case 0:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "1: Walls",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 1:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "2: Backing",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 2:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "3: Spikes",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 3:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "4: Trinkets",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 4:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "5: Checkpoint",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 5:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "6: Disappear",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 6:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "7: Conveyors",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 7:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "8: Moving",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 8:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "9: Enemies",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 9:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "0: Grav Line",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 10:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "R: Roomtext",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 11:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "T: Terminal",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 12:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "Y: Script Box",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 13:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "U: Warp Token",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 14:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "I: Warp Lines",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 15:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "O: Crewmate",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
case 16:
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.bprint(2,2, "P: Start Point",196, 196, 255 - help.glow);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
break;
}
}
Smoothly interpolate editor notedelay This makes editor notes fade out smoothly. And even though the notedelay only gets decremented by one every editor-frame (the editor runs at 1000/24 FPS fixed-timestep here), it actually gets multiplied by 4, so a floating-point interpolated value would make a difference here.
2020-05-02 19:42:39 +02:00
if(ed.notedelay>0 || ed.oldnotedelay>0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Smoothly interpolate editor notedelay This makes editor notes fade out smoothly. And even though the notedelay only gets decremented by one every editor-frame (the editor runs at 1000/24 FPS fixed-timestep here), it actually gets multiplied by 4, so a floating-point interpolated value would make a difference here.
2020-05-02 19:42:39 +02:00
float alpha = graphics.lerp(ed.oldnotedelay, ed.notedelay);
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
FillRect(graphics.backBuffer, 0,115,320,18, graphics.getRGB(92,92,92));
FillRect(graphics.backBuffer, 0,116,320,16, graphics.getRGB(0,0,0));
Smoothly interpolate editor notedelay This makes editor notes fade out smoothly. And even though the notedelay only gets decremented by one every editor-frame (the editor runs at 1000/24 FPS fixed-timestep here), it actually gets multiplied by 4, so a floating-point interpolated value would make a difference here.
2020-05-02 19:42:39 +02:00
graphics.Print(0,121, ed.note,196-((45.0f-alpha)*4), 196-((45.0f-alpha)*4), 196-((45.0f-alpha)*4), true);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.drawfade();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Only render screen effects on the title screen and in-game In-game because that's where screen effects are used the most. But on the title screen, screen effects are used when you press ACTION to start the game, and when you enable screen effects, too. Otherwise, we don't need screen effects for any other game-gamestate.
2020-04-27 04:29:40 +02:00
graphics.render();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorrenderfixed(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
extern editorclass ed;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = ed.getroomprop(ed.levx, ed.levy);
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
graphics.updatetitlecolours();
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
game.customcol=ed.getlevelcol(room->tileset, room->tilecol)+1;
Make sure sprite colors in the editor don't update more than 30 FPS This adds Graphics::crewcolourreal(), which is like the entityclass::crewcolour() that the editor already uses, except for the real color instead of the color ID. Also, editorclass now has an attribute `entcolreal` so enemy colors don't update more than 30 frames a second.
2020-05-02 22:53:19 +02:00
ed.entcol=ed.getenemycol(game.customcol);
graphics.setcol(ed.entcol);
ed.entcolreal = graphics.ct.colour;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix ed.currentghosts updating way too fast Just like all the other fixes, the variable that controls the amount of ghosts to show was being updated every render frame instead of every logic frame.
2020-06-13 02:24:08 +02:00
if (game.ghostsenabled)
{
Fix editor ghost colors updating too fast Like actual entities, editor ghost colors were updating every render frame instead of logic frame. So just like actual entities, I added a realcol attribute to them that editorrender() uses instead, and added code to update said realcol attribute in editorlogic(). That way the colors don't go by too quickly (especially the death color).
2020-06-13 02:34:19 +02:00
for (size_t i = 0; i < ed.ghosts.size(); i++)
{
GhostInfo& ghost = ed.ghosts[i];
if ((int) i > ed.currentghosts || ghost.rx != ed.levx || ghost.ry != ed.levy)
{
continue;
}
graphics.setcol(ghost.col);
ghost.realcol = graphics.ct.colour;
}
Fix ed.currentghosts updating way too fast Just like all the other fixes, the variable that controls the amount of ghosts to show was being updated every render frame instead of every logic frame.
2020-06-13 02:24:08 +02:00
if (ed.currentghosts + 1 < (int)ed.ghosts.size()) {
ed.currentghosts++;
if (ed.zmod) ed.currentghosts++;
} else {
ed.currentghosts = (int)ed.ghosts.size() - 1;
}
}
Move horizontal warp background to Graphics::updatebackground() This is so the background doesn't NYOOOOM past at light speed. Although for a game set in space like VVVVVV, light speed ain't bad. And this finally requires that editorlogic() have a call to Graphics::updatebackground().
2020-04-29 19:37:56 +02:00
if (!ed.settingsmod)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(room->warpdir)
Move horizontal warp background to Graphics::updatebackground() This is so the background doesn't NYOOOOM past at light speed. Although for a game set in space like VVVVVV, light speed ain't bad. And this finally requires that editorlogic() have a call to Graphics::updatebackground().
2020-04-29 19:37:56 +02:00
{
case 1:
graphics.rcol=ed.getwarpbackground(ed.levx, ed.levy);
graphics.updatebackground(3);
break;
Move vertical warp background updating to Graphics::updatebackground() Otherwise it will zoom by pretty quickly.
2020-04-29 20:06:03 +02:00
case 2:
graphics.rcol=ed.getwarpbackground(ed.levx, ed.levy);
graphics.updatebackground(4);
break;
Move all-sides warp background update code to logic functions Otherwise it'll go by really fast and rapidly pulsate. To the point where it seems like it would be an epilepsy trigger, although I wouldn't know anything about epilepsy other than that it's bad.
2020-04-30 00:37:39 +02:00
case 3:
graphics.rcol=ed.getwarpbackground(ed.levx, ed.levy);
graphics.updatebackground(5);
break;
Move horizontal warp background to Graphics::updatebackground() This is so the background doesn't NYOOOOM past at light speed. Although for a game set in space like VVVVVV, light speed ain't bad. And this finally requires that editorlogic() have a call to Graphics::updatebackground().
2020-04-29 19:37:56 +02:00
default:
break;
}
}
Move tower background update code to logic functions Otherwise it'll go really really quickly, which is not good.
2020-04-30 00:25:01 +02:00
else if (!game.colourblindmode)
{
Move title usages of towerbg to titlebg With the previous commit in place, we can now simply move some usages of the previous towerbg to use a separate object instead. That way, we don't have to mess with a monolithic state, or some better way to phrase what I just said, and we instead have two separate objects that can coexist side-by-side.
2020-11-03 00:23:53 +01:00
graphics.updatetowerbackground(graphics.titlebg);
Move tower background update code to logic functions Otherwise it'll go really really quickly, which is not good.
2020-04-30 00:25:01 +02:00
}
Move gravity line correction to editorrenderfixed Gravity line correction no longer happens on every deltaframe. This means less CPU time is wasted. Although, there's probably no need to correct gravity lines on every single frame... hm... well, that's an optimization for later (there's plenty of other stuff to cache, like minimap drawing or editor foreground drawing).
2021-03-10 00:36:05 +01:00
/* Correct gravity lines */
for (size_t i = 0; i < edentity.size(); ++i)
{
if (edentity[i].x / 40 != ed.levx
|| edentity[i].y / 30 != ed.levy
|| edentity[i].t != 11
/* Is the gravity line locked? */
|| edentity[i].p4 == 1)
{
continue;
}
if (edentity[i].p1 == 0)
{
/* Horizontal */
int tx = edentity[i].x % 40;
int tx2 = tx;
int ty = edentity[i].y % 30;
while (!ed.spikefree(tx, ty))
{
--tx;
}
while (!ed.spikefree(tx2, ty))
{
++tx2;
}
++tx;
edentity[i].p2 = tx;
edentity[i].p3 = (tx2 - tx) * 8;
}
else
{
/* Vertical */
int tx = edentity[i].x % 40;
int ty = edentity[i].y % 30;
int ty2 = ty;
/* Unlocked */
while (!ed.spikefree(tx, ty))
{
--ty;
}
while (!ed.spikefree(tx, ty2))
{
++ty2;
}
++ty;
edentity[i].p2 = ty;
edentity[i].p3 = (ty2 - ty) * 8;
}
}
Move Direct Mode drawer close to editorrenderfixed Now the drawer closing animation won't be based on deltatime.
2021-03-10 00:41:19 +01:00
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if (ed.getroomprop(ed.levx, ed.levy)->directmode == 1)
Move Direct Mode drawer close to editorrenderfixed Now the drawer closing animation won't be based on deltatime.
2021-03-10 00:41:19 +01:00
{
if (ed.dmtileeditor > 0)
{
ed.dmtileeditor--;
}
}
Reset drawer timer if not in Direct Mode room This fixes the drawer suddenly popping up only to disappear, if the user leaves a Direct Mode room into a non-Direct Mode room when the drawer hasn't closed all the way, and then re-enters a Direct Mode room.
2021-03-10 06:04:04 +01:00
else
{
ed.dmtileeditor = 0;
}
Move room name hiding update to editorrenderfixed Now the room name hiding animation won't be based on FPS.
2021-03-10 00:42:06 +01:00
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if (ed.getroomprop(ed.levx, ed.levy)->roomname != "")
Move room name hiding update to editorrenderfixed Now the room name hiding animation won't be based on FPS.
2021-03-10 00:42:06 +01:00
{
if (ed.tiley < 28)
{
if (ed.roomnamehide > 0)
{
ed.roomnamehide--;
}
}
else
{
if (ed.roomnamehide < 12)
{
ed.roomnamehide++;
}
}
}
Reset room name hide timer if in an unnamed room This avoids the room name awkwardly moving back up if the cursor is at the bottom of the screen in a room with a room name, then the user switches to a room without a room name, then moves the cursor away from the bottom, then switches to a named room - even though the cursor was already away from the bottom of the screen. Conversely, if the user moves their cursor to the bottom of the screen in an unnamed room, then switches into a named room, the room name will already have been hidden and they won't need to wait for it to hide.
2021-03-10 06:05:36 +01:00
else
{
if (ed.tiley < 28)
{
ed.roomnamehide = 0;
}
else
{
ed.roomnamehide = 12;
}
}
Move all fixed-timestep render updates to new file RenderFixed.cpp As part of fixing #464, I'll need to move these pieces of code around easily. In #220 I just kind of shoved them awkwardly in whatever fixed function would be last called in the gamestate loop, which I shouldn't have done as I've now had to make formal fixed-render functions anyway. Because these fixed functions need to be called directly before a render function, and I'm fixing the order to put render functions in their proper place, so I need to be able to move these around easily, and making them function calls instead of inlined makes them easier to manipulate.
2020-11-08 00:47:49 +01:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorlogic(void)
Move all fixed-timestep render updates to new file RenderFixed.cpp As part of fixing #464, I'll need to move these pieces of code around easily. In #220 I just kind of shoved them awkwardly in whatever fixed function would be last called in the gamestate loop, which I shouldn't have done as I've now had to make formal fixed-render functions anyway. Because these fixed functions need to be called directly before a render function, and I'm fixing the order to put render functions in their proper place, so I need to be able to move these around easily, and making them function calls instead of inlined makes them easier to manipulate.
2020-11-08 00:47:49 +01:00
{
extern editorclass ed;
//Misc
help.updateglow();
graphics.titlebg.bypos -= 2;
graphics.titlebg.bscroll = -2;
ed.entframedelay--;
if(ed.entframedelay<=0)
{
ed.entframe=(ed.entframe+1)%4;
ed.entframedelay=8;
}
ed.oldnotedelay = ed.notedelay;
if(ed.notedelay>0)
{
ed.notedelay--;
}
Move horizontal warp background to Graphics::updatebackground() This is so the background doesn't NYOOOOM past at light speed. Although for a game set in space like VVVVVV, light speed ain't bad. And this finally requires that editorlogic() have a call to Graphics::updatebackground().
2020-04-29 19:37:56 +02:00
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
if (graphics.fademode == 1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Return to game
Move title usages of towerbg to titlebg With the previous commit in place, we can now simply move some usages of the previous towerbg to use a separate object instead. That way, we don't have to mess with a monolithic state, or some better way to phrase what I just said, and we instead have two separate objects that can coexist side-by-side.
2020-11-03 00:23:53 +01:00
graphics.titlebg.colstate = 10;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
map.nexttowercolour();
Clean up all exit paths to the menu to use common code There are multiple different exit paths to the main menu. In 2.2, they all had a bunch of copy-pasted code. In 2.3 currently, most of them use game.quittomenu(), but there are some stragglers that still use hand-copied code. This is a bit of a problem, because all exit paths should consistently have FILESYSTEM_unmountassets(), as part of the 2.3 feature of per-level custom assets. Furthermore, most (but not all) of the paths call script.hardreset() too, and some of the stragglers don't. So there could be something persisting through to the title screen (like a really long flash/shake timer) that could only persist if exiting to the title screen through those paths. But, actually, it seems like there's a good reason for some of those to not call script.hardreset() - namely, dying or completing No Death Mode and completing a Time Trial presents some information onscreen that would get reset by script.hardreset(), so I'll fix that in a later commit. So what I've done for this commit is found every exit path that didn't already use game.quittomenu(), and made them use game.quittomenu(). As well, some of them had special handling that existed on top of them already having a corresponding entry in game.quittomenu() (but the path would take the special handling because it never did game.quittomenu()), so I removed that special handling as well (e.g. exiting from a custom level used returntomenu(Menu::levellist) when quittomenu() already had that same returntomenu()). The menu that exiting from the level editor returns to is now handled in game.quittomenu() as well, where the map.custommode branch now also checks for map.custommodeforreal. Unfortunately, it seems like entering the level editor doesn't properly initialize map.custommode, so entering the level editor now initializes map.custommode, too. I've also taken the music.play(6) out of game.quittomenu(), because not all exit paths immediately play Presenting VVVVVV, so all exit paths that DO immediately play Presenting VVVVVV now have music.play(6) special-cased for them, which is fine enough for me. Here is the list of all exit paths to the menu: - Exiting through the pause menu (without glitchrunner mode) - Exiting through the pause menu (with glitchrunner mode) - Completing a custom level - Completing a Time Trial - Dying in No Death Mode - Completing No Death Mode - Completing an Intermission replay - Exiting from the level editor - Completing the main game
2021-01-07 23:20:37 +01:00
game.quittomenu();
music.play(6); //should be before game.quittomenu()
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.settingsmod=false;
}
}
Fix 1-frame glitch when going to in-game options from edsettings The menu creation of Graphic Options or Game Options, as well as the map.nexttowercolour() call, all need to be deferred until the end of the frame.
2021-03-19 05:14:40 +01:00
static void creategraphicoptions(void)
{
game.createmenu(Menu::graphicoptions);
}
static void creategameoptions(void)
{
game.createmenu(Menu::options);
}
static void nextbgcolor(void)
{
map.nexttowercolour();
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix a few missing implicit void arg declarations While working on #535, I noticed that editormenuactionpress() still didn't do the explicit void declaration. Then I ran `rg 'void.*\(\)'` and found three other functions that I somehow missed in #628. Whoops. Well, now they no longer are missed.
2021-03-19 05:20:05 +01:00
static void editormenuactionpress(void)
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
extern editorclass ed;
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
switch (game.currentmenuname)
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
{
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
case Menu::ed_desc:
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
switch (game.currentmenuoption)
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
{
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
case 0:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
ed.titlemod=true;
key.enabletextentry();
key.keybuffer=EditorData::GetInstance().title;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 1:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
ed.creatormod=true;
key.enabletextentry();
key.keybuffer=EditorData::GetInstance().creator;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 2:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
ed.desc1mod=true;
key.enabletextentry();
key.keybuffer=ed.Desc1;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 3:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
ed.websitemod=true;
key.enabletextentry();
key.keybuffer=ed.website;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 4:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
music.playef(11);
Fix editor menu options going back to editor not using returnmenu() Instead of directly using Game::createmenu(Menu::ed_settings), we should be using Game::returnmenu() here, so the stack frames don't keep piling up.
2020-04-26 04:25:30 +02:00
game.returnmenu();
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
map.nexttowercolour();
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::ed_settings:
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
switch (game.currentmenuoption)
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
{
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
case 0:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Change level description stuff
music.playef(11);
Convert menu names to be an enum instead of being stringly-typed Stringly-typed things are bad, because if you make a typo when typing out a string, it's not caught at compile-time. And in the case of this menu system, you'd have to do an excessive amount of testing to uncover any bugs caused by a typo. Why do that when you can just use an enum and catch compile-time errors instead? Also, you can't use switch-case statements on stringly-typed variables. So every menu name is now in the enum Menu::MenuName, but you can simply refer to a menu name by just prefixing it with Menu::. Unfortunately, I've had to change the "continue" menu name to be "continuemenu", because "continue" is a keyword in C and C++. Also, it looks like "timetrialcomplete4" is an unused menu name, even though it was referenced in Render.cpp.
2020-04-16 06:53:36 +02:00
game.createmenu(Menu::ed_desc);
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
map.nexttowercolour();
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 1:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Enter script editormode
music.playef(11);
ed.scripteditmod=true;
ed.clearscriptbuffer();
key.keybuffer="";
ed.hookmenupage=0;
ed.hookmenu=0;
ed.scripthelppage=0;
ed.scripthelppagedelay=0;
ed.sby=0;
ed.sbx=0, ed.pagey=0;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 2:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
music.playef(11);
Convert menu names to be an enum instead of being stringly-typed Stringly-typed things are bad, because if you make a typo when typing out a string, it's not caught at compile-time. And in the case of this menu system, you'd have to do an excessive amount of testing to uncover any bugs caused by a typo. Why do that when you can just use an enum and catch compile-time errors instead? Also, you can't use switch-case statements on stringly-typed variables. So every menu name is now in the enum Menu::MenuName, but you can simply refer to a menu name by just prefixing it with Menu::. Unfortunately, I've had to change the "continue" menu name to be "continuemenu", because "continue" is a keyword in C and C++. Also, it looks like "timetrialcomplete4" is an unused menu name, even though it was referenced in Render.cpp.
2020-04-16 06:53:36 +02:00
game.createmenu(Menu::ed_music);
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
map.nexttowercolour();
if(ed.levmusic>0) music.play(ed.levmusic);
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 3:
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
music.playef(11);
game.ghostsenabled = !game.ghostsenabled;
break;
case 4:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Load level
ed.settingsmod=false;
graphics.backgrounddrawn=false;
map.nexttowercolour();
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.keydelay = 6;
ed.getlin(TEXT_LOAD, "Enter map filename to load:", &(ed.filename));
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
game.mapheld=true;
graphics.backgrounddrawn=false;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
case 5:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Save level
ed.settingsmod=false;
map.nexttowercolour();
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.keydelay = 6;
ed.getlin(TEXT_SAVE, "Enter map filename to save as:", &(ed.filename));
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
game.mapheld=true;
graphics.backgrounddrawn=false;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
case 6:
Add graphic options and game options to editor settings This is a small quality-of-life tweak that makes it so if you're in the middle of editing a level, you don't have to save the level, exit to the menu, change whatever setting you wanted, re-enter the editor, and type in the level name, just to change one setting. This is the same as adding Graphic Options and Game Options to the in-game pause menu, except for the editor, too. To do this, I'm reusing Game::returntopausemenu() (because all of its callers are the same callers for returning to editor settings) and renamed it to returntoingame(), then added a variable named ingame_editormode to Game. When we're in the options menus but still in the editor, BOTH ingame_titlemode and ingame_editormode will be true.
2021-03-19 03:52:30 +01:00
case 7:
/* Graphic options and game options */
music.playef(11);
game.gamestate = TITLEMODE;
game.ingame_titlemode = true;
game.ingame_editormode = true;
if (game.currentmenuoption == 6)
{
Fix 1-frame glitch when going to in-game options from edsettings The menu creation of Graphic Options or Game Options, as well as the map.nexttowercolour() call, all need to be deferred until the end of the frame.
2021-03-19 05:14:40 +01:00
DEFER_CALLBACK(creategraphicoptions);
Add graphic options and game options to editor settings This is a small quality-of-life tweak that makes it so if you're in the middle of editing a level, you don't have to save the level, exit to the menu, change whatever setting you wanted, re-enter the editor, and type in the level name, just to change one setting. This is the same as adding Graphic Options and Game Options to the in-game pause menu, except for the editor, too. To do this, I'm reusing Game::returntopausemenu() (because all of its callers are the same callers for returning to editor settings) and renamed it to returntoingame(), then added a variable named ingame_editormode to Game. When we're in the options menus but still in the editor, BOTH ingame_titlemode and ingame_editormode will be true.
2021-03-19 03:52:30 +01:00
}
else
{
Fix 1-frame glitch when going to in-game options from edsettings The menu creation of Graphic Options or Game Options, as well as the map.nexttowercolour() call, all need to be deferred until the end of the frame.
2021-03-19 05:14:40 +01:00
DEFER_CALLBACK(creategameoptions);
Add graphic options and game options to editor settings This is a small quality-of-life tweak that makes it so if you're in the middle of editing a level, you don't have to save the level, exit to the menu, change whatever setting you wanted, re-enter the editor, and type in the level name, just to change one setting. This is the same as adding Graphic Options and Game Options to the in-game pause menu, except for the editor, too. To do this, I'm reusing Game::returntopausemenu() (because all of its callers are the same callers for returning to editor settings) and renamed it to returntoingame(), then added a variable named ingame_editormode to Game. When we're in the options menus but still in the editor, BOTH ingame_titlemode and ingame_editormode will be true.
2021-03-19 03:52:30 +01:00
}
Fix 1-frame glitch when going to in-game options from edsettings The menu creation of Graphic Options or Game Options, as well as the map.nexttowercolour() call, all need to be deferred until the end of the frame.
2021-03-19 05:14:40 +01:00
DEFER_CALLBACK(nextbgcolor);
Add graphic options and game options to editor settings This is a small quality-of-life tweak that makes it so if you're in the middle of editing a level, you don't have to save the level, exit to the menu, change whatever setting you wanted, re-enter the editor, and type in the level name, just to change one setting. This is the same as adding Graphic Options and Game Options to the in-game pause menu, except for the editor, too. To do this, I'm reusing Game::returntopausemenu() (because all of its callers are the same callers for returning to editor settings) and renamed it to returntoingame(), then added a variable named ingame_editormode to Game. When we're in the options menus but still in the editor, BOTH ingame_titlemode and ingame_editormode will be true.
2021-03-19 03:52:30 +01:00
break;
default:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
music.playef(11);
Convert menu names to be an enum instead of being stringly-typed Stringly-typed things are bad, because if you make a typo when typing out a string, it's not caught at compile-time. And in the case of this menu system, you'd have to do an excessive amount of testing to uncover any bugs caused by a typo. Why do that when you can just use an enum and catch compile-time errors instead? Also, you can't use switch-case statements on stringly-typed variables. So every menu name is now in the enum Menu::MenuName, but you can simply refer to a menu name by just prefixing it with Menu::. Unfortunately, I've had to change the "continue" menu name to be "continuemenu", because "continue" is a keyword in C and C++. Also, it looks like "timetrialcomplete4" is an unused menu name, even though it was referenced in Render.cpp.
2020-04-16 06:53:36 +02:00
game.createmenu(Menu::ed_quit);
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
map.nexttowercolour();
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::ed_music:
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
switch (game.currentmenuoption)
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
{
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
case 0:
Add previous song option to editor music screen This is just a small quality-of-life feature - it's annoying to have to press ACTION 15 times in order to cycle back through to the previous song.
2021-03-05 09:55:57 +01:00
case 1:
switch (game.currentmenuoption)
{
case 0:
ed.levmusic++;
break;
case 1:
ed.levmusic--;
break;
}
ed.levmusic = (ed.levmusic % 16 + 16) % 16;
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
if(ed.levmusic>0)
{
music.play(ed.levmusic);
}
else
{
music.haltdasmusik();
}
music.playef(11);
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Add previous song option to editor music screen This is just a small quality-of-life feature - it's annoying to have to press ACTION 15 times in order to cycle back through to the previous song.
2021-03-05 09:55:57 +01:00
case 2:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
music.playef(11);
music.fadeout();
Fix editor menu options going back to editor not using returnmenu() Instead of directly using Game::createmenu(Menu::ed_settings), we should be using Game::returnmenu() here, so the stack frames don't keep piling up.
2020-04-26 04:25:30 +02:00
game.returnmenu();
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
map.nexttowercolour();
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
case Menu::ed_quit:
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
switch (game.currentmenuoption)
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
{
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
case 0:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Saving and quit
ed.saveandquit=true;
ed.settingsmod=false;
map.nexttowercolour();
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.keydelay = 6;
ed.getlin(TEXT_SAVE, "Enter map filename to save as:", &(ed.filename));
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
game.mapheld=true;
graphics.backgrounddrawn=false;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 1:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Quit without saving
music.playef(11);
music.fadeout();
graphics.fademode = 2;
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
case 2:
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
//Go back to editor
music.playef(11);
Fix editor menu options going back to editor not using returnmenu() Instead of directly using Game::createmenu(Menu::ed_settings), we should be using Game::returnmenu() here, so the stack frames don't keep piling up.
2020-04-26 04:25:30 +02:00
game.returnmenu();
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
map.nexttowercolour();
Change "else if"-chain in editormenuactionpress to case-switch It makes it better so you don't have to deal with that dangling first "if" that doesn't have an 'else'.
2020-04-16 06:01:00 +02:00
break;
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
}
Turn game.currentmenuname "else-if"s into case-switches Much more stylistic, you don't need to repeat "game.currentmenuname" for each case, and you don't need to deal with the dangling first "if" that doesn't have an "else".
2020-04-17 00:19:17 +02:00
break;
default:
break;
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
}
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void editorinput(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
extern editorclass ed;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.mx = (float) key.mx;
game.my = (float) key.my;
ed.tilex=(game.mx - (game.mx%8))/8;
ed.tiley=(game.my - (game.my%8))/8;
Remove duplicate screen configuration variables There were some duplicate Screen configuration variables that were on Game, when there didn't need to be. - game.fullScreenEffect_badSignal is a duplicate of graphics.screenbuffer->badSignalEffect - game.fullscreen is a duplicate of !graphics.screenbuffer->isWindowed - game.stretchMode is a duplicate of graphics.screenbuffer->stretchMode - game.useLinearFilter is a duplicate of graphics.screenbuffer->isFiltered These duplicate variables have been removed now. I put indentation when handling the ScreenSettings struct in main() so the local doesn't live for the entirety of main() (which is the entirety of the program).
2020-11-13 01:45:51 +01:00
if (graphics.screenbuffer->stretchMode == 1) {
Fix scaling editor mouse coords properly in stretch mode Now your cursor will properly align with the editor's cursor if you're in stretch mode. Closes #27.
2020-01-12 10:09:32 +01:00
// In this mode specifically, we have to fix the mouse coordinates
int winwidth, winheight;
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.screenbuffer->GetWindowSize(&winwidth, &winheight);
Fix scaling editor mouse coords properly in stretch mode Now your cursor will properly align with the editor's cursor if you're in stretch mode. Closes #27.
2020-01-12 10:09:32 +01:00
ed.tilex = ed.tilex * 320 / winwidth;
ed.tiley = ed.tiley * 240 / winheight;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Fix pressing Enter moving you leftwards in the editor Whoops.
2020-07-01 04:40:24 +02:00
bool up_pressed = key.isDown(SDLK_UP) || key.isDown(SDL_CONTROLLER_BUTTON_DPAD_UP);
bool down_pressed = key.isDown(SDLK_DOWN) || key.isDown(SDL_CONTROLLER_BUTTON_DPAD_DOWN);
bool left_pressed = key.isDown(SDLK_LEFT) || key.isDown(SDL_CONTROLLER_BUTTON_DPAD_LEFT);
bool right_pressed = key.isDown(SDLK_RIGHT) || key.isDown(SDL_CONTROLLER_BUTTON_DPAD_RIGHT);
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.press_left = false;
game.press_right = false;
game.press_action = false;
game.press_map = false;
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if (key.isDown(KEYBOARD_LEFT) || key.isDown(KEYBOARD_a) || key.controllerWantsLeft(false))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.press_left = true;
}
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if (key.isDown(KEYBOARD_RIGHT) || key.isDown(KEYBOARD_d) || key.controllerWantsRight(false))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.press_right = true;
}
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.press_action = true;
};
Per-level custom asset loading functionality (#262)
2020-06-01 01:31:02 +02:00
if (key.keymap[SDLK_F9] && (ed.keydelay==0)) {
ed.keydelay = 30;
ed.note="Reloaded resources";
ed.notedelay=45;
graphics.reloadresources();
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (key.isDown(KEYBOARD_ENTER)) game.press_map = true;
if (key.isDown(27) && !ed.settingskey)
{
ed.settingskey=true;
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
if (ed.textmod)
{
key.disabletextentry();
if (ed.textmod >= FIRST_ENTTEXT && ed.textmod <= LAST_ENTTEXT)
{
*ed.textptr = ed.oldenttext;
if (ed.oldenttext == "")
{
removeedentity(ed.textent);
}
}
ed.textmod = TEXT_NONE;
ed.shiftmenu = false;
ed.shiftkey = false;
}
Axe manual state trackers and use SDL_IsTextInputActive() After looking at pull request #446, I got a bit annoyed that we have TWO variables, key.textentrymode and ed.textentry, that we rolled ourselves to track the state of something SDL already provides us a function to easily query: SDL_IsTextInputActive(). We don't need to have either of these two variables, and we shouldn't. So that's what I do in this patch. Both variables have been axed in favor of using this function, and I just made a wrapper out of it, named key.textentry(). For bonus points, this gets rid of the ugly NO_CUSTOM_LEVELS and NO_EDITOR ifdef in main.cpp, since text entry is enabled when entering the script list and disabled when exiting it. This makes the code there easier to read, too. Furthermore, apparently key.textentrymode was initialized to *true* instead of false... for whatever reason. But that's gone now, too. Now, you'd think there wouldn't be any downside to using SDL_IsTextInputActive(). After all, it's a function that SDL itself provides, right? Wrong. For whatever reason, it seems like text input is active *from the start of the program*, meaning that what would happen is I would go into the editor, and find that I can't move around nor place tiles nor anything else. Then I would press Esc, and then suddenly become able to do those things I wanted to do before. I have no idea why the above happens, but all I can do is to just insert an SDL_StopTextInput() immediately after the SDL_Init() in main.cpp. Of course, I have to surround it with an SDL_IsTextInputActive() check to make sure I don't do anything extraneous by stopping input when it's already stopped.
2020-08-13 08:43:25 +02:00
else if (key.textentry())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
key.disabletextentry();
ed.titlemod=false;
ed.desc1mod=false;
ed.desc2mod=false;
ed.desc3mod=false;
ed.websitemod=false;
ed.creatormod=false;
ed.shiftmenu=false;
ed.shiftkey=false;
}
else if(ed.boundarymod>0)
{
ed.boundarymod=0;
}
else
{
Add being able to press Esc to return to previous menu This is a small quality-of-life thing that makes it so you don't have to move your menu selection all the way over to the "return" button in order to return to the previous menu. You can just press Escape instead to return to the previous menu. The previous behavior of pressing Escape was to bring up the 'confirm quit' menu, or if you were in an options menu in-game, return to the pause menu. If you're on the main menu (and thus don't have any previous menu) and press Escape, the game will instead bring up the 'confirm quit' menu. For consistency, the "quit game" option on the main menu will also bring up the 'confirm quit' menu as well, instead of immediately closing the game. Pressing the controller button mapped to Escape will also work as well. The only menus that don't have return buttons are the 'countdown' menus - so the game will not let you press Escape if there's a menu countdown happening. Now that pressing Escape in the 'continue' menu will just bring you back to the 'play' menu, there's no need to specifically put map.nexttowercolour() first when canceling the 'confirm quit' menu.
2021-02-22 09:28:43 +01:00
music.playef(11);
if (ed.settingsmod)
{
if (ed.scripteditmod)
{
ed.scripteditmod = false;
}
else if (ed.settingsmod)
{
if (game.currentmenuname == Menu::ed_settings)
{
ed.settingsmod = false;
}
else
{
game.returnmenu();
map.nexttowercolour();
}
}
}
else
{
ed.settingsmod = true;
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.backgrounddrawn=false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Improve ed_settings Esc press handling This fixes being able to rack up a large amount of stack frames by pressing Esc repeatedly in the editor, which would be a problem if you were to then return to the main menu afterwards. Instead, if Menu::ed_settings is already in the stack, the game will simply return to that menu instead of creating it. Else, it will just create the menu. Also, as extra attention to detail, I made sure that the menu create or return only happens if Esc opens the settings menu, and not when Esc is closes it.
2020-04-26 04:37:33 +02:00
if (ed.settingsmod)
{
bool edsettings_in_stack = false;
for (size_t i = 0; i < game.menustack.size(); i++)
{
if (game.menustack[i].name == Menu::ed_settings)
{
edsettings_in_stack = true;
break;
}
}
if (edsettings_in_stack)
{
game.returntomenu(Menu::ed_settings);
}
else
{
game.createmenu(Menu::ed_settings);
}
map.nexttowercolour();
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if (!key.isDown(27))
{
ed.settingskey=false;
}
if(key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL])
{
if(key.leftbutton) key.rightbutton=true;
}
if(ed.scripteditmod)
{
if(ed.scripthelppage==0)
{
//hook select menu
if(ed.keydelay>0) ed.keydelay--;
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if(up_pressed && ed.keydelay<=0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.keydelay=6;
ed.hookmenu--;
}
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if(down_pressed && ed.keydelay<=0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.keydelay=6;
ed.hookmenu++;
}
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(ed.hookmenu>=(int)ed.hooklist.size())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
ed.hookmenu=ed.hooklist.size()-1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if(ed.hookmenu<0) ed.hookmenu=0;
if(ed.hookmenu<ed.hookmenupage)
{
ed.hookmenupage=ed.hookmenu;
}
if(ed.hookmenu>=ed.hookmenupage+9)
{
ed.hookmenupage=ed.hookmenu+8;
}
if(!key.keymap[SDLK_BACKSPACE]) ed.deletekeyheld=0;
Fix undefined behavior when backspacing in script list with 0 scripts The problem is that it would index out-of-bounds if you did this, but this UB hasn't caused an exception until my change to refactor script-related vectors by removing their separate length-trackers.
2020-04-03 21:23:37 +02:00
if(key.keymap[SDLK_BACKSPACE] && ed.deletekeyheld==0 && !ed.hooklist.empty())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.deletekeyheld=1;
music.playef(2);
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
ed.removehook(ed.hooklist[(ed.hooklist.size()-1)-ed.hookmenu]);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
if (!game.press_action && !game.press_left && !game.press_right
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
&& !up_pressed && !down_pressed && !key.isDown(27)) game.jumpheld = false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (!game.jumpheld)
{
if (game.press_action || game.press_left || game.press_right || game.press_map
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
|| up_pressed || down_pressed || key.isDown(27))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.jumpheld = true;
}
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if ((game.press_action || game.press_map) && !ed.hooklist.empty())
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.mapheld=true;
ed.scripthelppage=1;
Move text entry start to script open instead of script list open This fixes a bug where opening a script, then closing the script but not exiting the script list, then opening a script again (it can be the same script as before) would result in you being unable to type in the script. You would have to close the script, then close the script list, then re-open the script list in order to be able to type properly. This was caused by the fact that key.enabletextentry() was being called when the script list was opened, but key.disabletextentry() was being called when closing a script. So the fix for this is to simply move the key.enabletextentry() to its proper place, which is when the script is being opened, and not when the script list is.
2020-08-18 00:39:19 +02:00
key.enabletextentry();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
key.keybuffer="";
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
ed.sbscript=ed.hooklist[(ed.hooklist.size()-1)-ed.hookmenu];
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.loadhookineditor(ed.sbscript);
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
ed.sby=ed.sb.size()-1;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.pagey=0;
while(ed.sby>=20)
{
ed.pagey++;
ed.sby--;
}
key.keybuffer=ed.sb[ed.pagey+ed.sby];
Add support for Unicode rendering (#47) This uses utfcpp combined with a custom font, in the form of a PNG and text file. By default, the game acts exactly as it did before; custom fonts can be provided by third parties.
2020-01-31 19:25:37 +01:00
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
else if(ed.scripthelppage==1)
{
//Script editor!
if (key.isDown(27))
{
ed.scripthelppage=0;
game.jumpheld = true;
//save the script for use again!
ed.addhook(ed.sbscript);
}
if(ed.keydelay>0) ed.keydelay--;
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if(up_pressed && ed.keydelay<=0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.keydelay=6;
ed.sby--;
if(ed.sby<=5)
{
if(ed.pagey>0)
{
ed.pagey--;
ed.sby++;
}
else
{
if(ed.sby<0) ed.sby=0;
}
}
key.keybuffer=ed.sb[ed.pagey+ed.sby];
}
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if(down_pressed && ed.keydelay<=0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.keydelay=6;
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(ed.sby+ed.pagey<(int)ed.sb.size()-1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.sby++;
if(ed.sby>=20)
{
ed.pagey++;
ed.sby--;
}
}
key.keybuffer=ed.sb[ed.pagey+ed.sby];
}
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
if(key.linealreadyemptykludge)
{
ed.keydelay=6;
key.linealreadyemptykludge=false;
}
if(key.pressedbackspace && ed.sb[ed.pagey+ed.sby]=="" && ed.keydelay<=0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Remove this line completely
ed.removeline(ed.pagey+ed.sby);
ed.sby--;
if(ed.sby<=5)
{
if(ed.pagey>0)
{
ed.pagey--;
ed.sby++;
}
else
{
if(ed.sby<0) ed.sby=0;
}
}
key.keybuffer=ed.sb[ed.pagey+ed.sby];
Set ed.keydelay when backspacing an empty line Similar to 2ebccbc3e9a06b4148e8014808ef6fe45e298c8d, there's also a long-standing bug where if you backspace an empty line (and this time, the line IS actually already empty, not merely emptied-earlier-in-the-frame), the game will quickly delete more blank lines if there are any above the blank line you deleted. Again, this is annoying too, if you so happen to need to use lots of blank lines. To fix this, it's simple - just set ed.keydelay to 6 when the game backspaces an empty line. Then it won't be so trigger-happy in deleting blank lines.
2020-01-19 03:39:39 +01:00
ed.keydelay=6;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Prevent typing pipes in the script editor This prevents users from being confused whenever they type a pipe in the script editor, then save the level and load it again and see their script lines unexpectedly splitting in two. Now if you attempt to type a pipe, it simply won't happen at all. Fixes #379.
2020-09-28 00:14:42 +02:00
// Remove all pipes, they are the line separator in the XML
key.keybuffer.erase(std::remove(key.keybuffer.begin(), key.keybuffer.end(), '|'), key.keybuffer.end());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.sb[ed.pagey+ed.sby]=key.keybuffer;
Add support for Unicode rendering (#47) This uses utfcpp combined with a custom font, in the form of a PNG and text file. By default, the game acts exactly as it did before; custom fonts can be provided by third parties.
2020-01-31 19:25:37 +01:00
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(!game.press_map && !key.isDown(27)) game.mapheld=false;
if (!game.mapheld)
{
if(game.press_map)
{
game.mapheld=true;
//Continue to next line
Make `commands`, `sb`, and `hooklist` not use separate length-trackers This is a refactor that turns the script-related arrays `ed.sb`, and `ed.hooklist` into C++ vectors (`script.commands` was already a vector, it was just misused). The code handling these vectors now looks more like idiomatic C++ than sloppily-pasted pseudo-ActionScript. This removes the variables `script.scriptlength`, `ed.sblength`, and `ed.numhooks`, too. This reduces the amount of code needed to e.g. simply remove something from any of these vectors. Previously the code had to manually shift the rest of the elements down one-by-one, and doing it manually is definitely error-prone and tedious. But now we can just use fancy functions like `std::vector::erase()` and `std::remove()` to do it all in one line! Don't worry, I checked and `std::remove()` is in the C++ standard since at least 1998. This patch makes it so the `commands` vector gets cleared when `scriptclass::load()` is ran. Previously, the `commands` vector never actually properly got cleared, so there could potentially be glitches that rely on the game indexing past the bounds set by `scriptlength` but still in-bounds in the eyes of C++, and people could potentially rely on such an exploit... However, I checked, and I'm pretty sure that no such glitch previously existed at all, because the only times the vector gets indexed are when `scriptlength` is either being incremented after starting from 0 (`add()`) or when it's underneath a `position < scriptlength` conditional. Furthermore, I'm unaware of anyone who has actually found or used such an exploit, and I've been in the custom level community for 6 years. So I think it's fine.
2020-02-20 18:43:52 +01:00
if(ed.sby+ed.pagey>=(int)ed.sb.size()) //we're on the last line
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.sby++;
if(ed.sby>=20)
{
ed.pagey++;
ed.sby--;
}
key.keybuffer=ed.sb[ed.pagey+ed.sby];
Add support for Unicode rendering (#47) This uses utfcpp combined with a custom font, in the form of a PNG and text file. By default, the game acts exactly as it did before; custom fonts can be provided by third parties.
2020-01-31 19:25:37 +01:00
ed.sbx = utf8::unchecked::distance(ed.sb[ed.pagey+ed.sby].begin(), ed.sb[ed.pagey+ed.sby].end());
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
//We're not, insert a line instead
ed.sby++;
if(ed.sby>=20)
{
ed.pagey++;
ed.sby--;
}
ed.insertline(ed.sby+ed.pagey);
key.keybuffer="";
ed.sbx = 0;
}
}
}
}
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
else if (ed.textmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
*ed.textptr = key.keybuffer;
if (!game.press_map && !key.isDown(27))
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
game.mapheld = false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
if (!game.mapheld && game.press_map)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
game.mapheld = true;
key.disabletextentry();
switch (ed.textmod)
{
Add G keybind to go to room Ved has this useful feature where instead of having to manually travel to a room whose coordinates you know, you can just press G and type in coordinates to go there. VCE added this, but I changed the text to be "x,y" instead of "(x,y)" because otherwise it could confuse someone into thinking they need to type parentheses when in reality they don't need to and typing them will just make it not work. Also I made sure to add an error message if the user types in an invalid format. Failing silently would just confuse people, and maybe they'll start thinking the feature doesn't work or something like that. VCE doesn't have this helpful error message. Lastly, VCE has a bug where if you use the shortcut to go from one horizontally/vertically warping room to another, the background of the previous room will still be there and scroll off with the background of the room you went to, instead of just having the new background only. This is because they forgot a 'graphics.backgrounddrawn = false;'. But don't worry, *I* didn't forget about it.
2020-07-01 08:35:59 +02:00
case TEXT_GOTOROOM:
{
Refactor editor gotoroom shortcut to not use split() Even if split() didn't use the STL, using this function here is a bit unnecessary, because a simple SDL_strchr() suffices. Refactoring split() to not use the STL will break this caller anyway, so I might as well just refactor this to not use split() in the first place. This refactor also properly checks if the inputs are valid integers. And since split() is no longer used, it also rejects inputs ending with a trailing comma as being invalid, too; this didn't happen previously. It's intentional that I used is_number() here instead of is_positive_num(), thus accepting negative numbers; in the future it might be possible to have negative room coordinates.
2021-02-12 02:02:32 +01:00
char coord_x[16];
char coord_y[16];
const char* comma = SDL_strchr(key.keybuffer.c_str(), ',');
bool valid_input = comma != NULL;
if (valid_input)
{
SDL_strlcpy(
coord_x,
key.keybuffer.c_str(),
VVV_min(comma - key.keybuffer.c_str() + 1, sizeof(coord_x))
);
SDL_strlcpy(coord_y, &comma[1], sizeof(coord_y));
valid_input = is_number(coord_x) && is_number(coord_y);
}
if (!valid_input)
Add G keybind to go to room Ved has this useful feature where instead of having to manually travel to a room whose coordinates you know, you can just press G and type in coordinates to go there. VCE added this, but I changed the text to be "x,y" instead of "(x,y)" because otherwise it could confuse someone into thinking they need to type parentheses when in reality they don't need to and typing them will just make it not work. Also I made sure to add an error message if the user types in an invalid format. Failing silently would just confuse people, and maybe they'll start thinking the feature doesn't work or something like that. VCE doesn't have this helpful error message. Lastly, VCE has a bug where if you use the shortcut to go from one horizontally/vertically warping room to another, the background of the previous room will still be there and scroll off with the background of the room you went to, instead of just having the new background only. This is because they forgot a 'graphics.backgrounddrawn = false;'. But don't worry, *I* didn't forget about it.
2020-07-01 08:35:59 +02:00
{
ed.note = "[ ERROR: Invalid format ]";
ed.notedelay = 45;
break;
}
Refactor editor gotoroom shortcut to not use split() Even if split() didn't use the STL, using this function here is a bit unnecessary, because a simple SDL_strchr() suffices. Refactoring split() to not use the STL will break this caller anyway, so I might as well just refactor this to not use split() in the first place. This refactor also properly checks if the inputs are valid integers. And since split() is no longer used, it also rejects inputs ending with a trailing comma as being invalid, too; this didn't happen previously. It's intentional that I used is_number() here instead of is_positive_num(), thus accepting negative numbers; in the future it might be possible to have negative room coordinates.
2021-02-12 02:02:32 +01:00
ed.levx = clamp(help.Int(coord_x) - 1, 0, ed.mapwidth - 1);
ed.levy = clamp(help.Int(coord_y) - 1, 0, ed.mapheight - 1);
Add G keybind to go to room Ved has this useful feature where instead of having to manually travel to a room whose coordinates you know, you can just press G and type in coordinates to go there. VCE added this, but I changed the text to be "x,y" instead of "(x,y)" because otherwise it could confuse someone into thinking they need to type parentheses when in reality they don't need to and typing them will just make it not work. Also I made sure to add an error message if the user types in an invalid format. Failing silently would just confuse people, and maybe they'll start thinking the feature doesn't work or something like that. VCE doesn't have this helpful error message. Lastly, VCE has a bug where if you use the shortcut to go from one horizontally/vertically warping room to another, the background of the previous room will still be there and scroll off with the background of the room you went to, instead of just having the new background only. This is because they forgot a 'graphics.backgrounddrawn = false;'. But don't worry, *I* didn't forget about it.
2020-07-01 08:35:59 +02:00
graphics.backgrounddrawn = false;
break;
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
case TEXT_LOAD:
{
std::string loadstring = ed.filename + ".vvvvvv";
if (ed.load(loadstring))
{
// don't use filename, it has the full path
char buffer[64];
SDL_snprintf(buffer, sizeof(buffer), "[ Loaded map: %s.vvvvvv ]", ed.filename.c_str());
ed.note = buffer;
}
else
{
ed.note = "[ ERROR: Could not load level ]";
}
ed.notedelay = 45;
break;
}
case TEXT_SAVE:
{
std::string savestring = ed.filename + ".vvvvvv";
if (ed.save(savestring))
{
char buffer[64];
SDL_snprintf(buffer, sizeof(buffer), "[ Saved map: %s.vvvvvv ]", ed.filename.c_str());
ed.note = buffer;
}
else
{
ed.note = "[ ERROR: Could not save level! ]";
ed.saveandquit = false;
}
ed.notedelay = 45;
if (ed.saveandquit)
{
graphics.fademode = 2; // quit editor
}
break;
}
case TEXT_SCRIPT:
ed.clearscriptbuffer();
if (!ed.checkhook(key.keybuffer))
{
ed.addhook(key.keybuffer);
}
break;
default:
break;
}
ed.shiftmenu = false;
ed.shiftkey = false;
ed.textmod = TEXT_NONE;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
}
Axe manual state trackers and use SDL_IsTextInputActive() After looking at pull request #446, I got a bit annoyed that we have TWO variables, key.textentrymode and ed.textentry, that we rolled ourselves to track the state of something SDL already provides us a function to easily query: SDL_IsTextInputActive(). We don't need to have either of these two variables, and we shouldn't. So that's what I do in this patch. Both variables have been axed in favor of using this function, and I just made a wrapper out of it, named key.textentry(). For bonus points, this gets rid of the ugly NO_CUSTOM_LEVELS and NO_EDITOR ifdef in main.cpp, since text entry is enabled when entering the script list and disabled when exiting it. This makes the code there easier to read, too. Furthermore, apparently key.textentrymode was initialized to *true* instead of false... for whatever reason. But that's gone now, too. Now, you'd think there wouldn't be any downside to using SDL_IsTextInputActive(). After all, it's a function that SDL itself provides, right? Wrong. For whatever reason, it seems like text input is active *from the start of the program*, meaning that what would happen is I would go into the editor, and find that I can't move around nor place tiles nor anything else. Then I would press Esc, and then suddenly become able to do those things I wanted to do before. I have no idea why the above happens, but all I can do is to just insert an SDL_StopTextInput() immediately after the SDL_Init() in main.cpp. Of course, I have to surround it with an SDL_IsTextInputActive() check to make sure I don't do anything extraneous by stopping input when it's already stopped.
2020-08-13 08:43:25 +02:00
else if (key.textentry())
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
{
if(ed.titlemod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
EditorData::GetInstance().title=key.keybuffer;
}
else if(ed.creatormod)
{
EditorData::GetInstance().creator=key.keybuffer;
}
else if(ed.websitemod)
{
ed.website=key.keybuffer;
}
else if(ed.desc1mod)
{
ed.Desc1=key.keybuffer;
}
else if(ed.desc2mod)
{
ed.Desc2=key.keybuffer;
}
else if(ed.desc3mod)
{
ed.Desc3=key.keybuffer;
}
if(!game.press_map && !key.isDown(27)) game.mapheld=false;
if (!game.mapheld)
{
if(game.press_map)
{
game.mapheld=true;
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
if(ed.titlemod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
EditorData::GetInstance().title=key.keybuffer;
ed.titlemod=false;
}
else if(ed.creatormod)
{
EditorData::GetInstance().creator=key.keybuffer;
ed.creatormod=false;
}
else if(ed.websitemod)
{
ed.website=key.keybuffer;
ed.websitemod=false;
}
else if(ed.desc1mod)
{
ed.Desc1=key.keybuffer;
}
else if(ed.desc2mod)
{
ed.Desc2=key.keybuffer;
}
else if(ed.desc3mod)
{
ed.Desc3=key.keybuffer;
ed.desc3mod=false;
}
key.disabletextentry();
if(ed.desc1mod)
{
ed.desc1mod=false;
ed.desc2mod=true;
key.enabletextentry();
key.keybuffer=ed.Desc2;
}
else if(ed.desc2mod)
{
ed.desc2mod=false;
ed.desc3mod=true;
key.enabletextentry();
key.keybuffer=ed.Desc3;
}
}
}
}
else
{
if(ed.settingsmod)
{
if (!game.press_action && !game.press_left && !game.press_right
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
&& !up_pressed && !down_pressed) game.jumpheld = false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (!game.jumpheld)
{
if (game.press_action || game.press_left || game.press_right || game.press_map
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
|| up_pressed || down_pressed)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.jumpheld = true;
}
if(game.menustart)
{
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
if (game.press_left || up_pressed)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.currentmenuoption--;
}
Allow D-Pad to act as arrow keys in the editor This doesn't make the editor completely accessible on controller, but it's a good start at least. VCE already let you move between rooms with the D-Pad, though.
2020-07-01 02:39:32 +02:00
else if (game.press_right || down_pressed)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
game.currentmenuoption++;
}
}
Refactor menu creation code Firstly, menu options are no longer ad-hoc objects, and are added by using Game::option() (this is the biggest change). This removes the vector Game::menuoptionsactive, and Game::menuoptions is now a vector of MenuOption instead of std::string. Secondly, the manual tracker variable of the amount of menu options, Game::nummenuoptions, has been removed, in favor of using vectors properly and using Game::menuoptions::size(). As a result, a lot of copy-pasted code has been removed from Game::createmenu(), mostly due to having to have different versions of menus depending on whether or not we have certain defines, or having an mmmmmm.vvv file inside the VVVVVV directory. In the old days, you couldn't just add or remove a menu option conveniently, you had to shuffle around the position of every other menu option too, which resulted in lots of copy-pasted code. But now this copy-pasted code has been de-duplicated, at least in Game::createmenu().
2020-04-15 06:50:17 +02:00
if (game.currentmenuoption < 0) game.currentmenuoption = game.menuoptions.size()-1;
if (game.currentmenuoption >= (int) game.menuoptions.size() ) game.currentmenuoption = 0;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if (game.press_action)
{
Move editor menu ACTION press handling to separate function This removes a whopping four indentation levels from the ACTION handling, and makes editorinput() easier to read.
2020-04-16 05:52:21 +02:00
editormenuactionpress();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
else if (ed.keydelay > 0)
{
ed.keydelay--;
}
else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL])
{
// Ctrl modifiers
ed.dmtileeditor=10;
if(left_pressed)
{
ed.dmtile--;
ed.keydelay=3;
if(ed.dmtile<0) ed.dmtile+=1200;
}
else if(right_pressed)
{
ed.dmtile++;
ed.keydelay=3;
if(ed.dmtile>=1200) ed.dmtile-=1200;
}
if(up_pressed)
{
ed.dmtile-=40;
ed.keydelay=3;
if(ed.dmtile<0) ed.dmtile+=1200;
}
else if(down_pressed)
{
ed.dmtile+=40;
ed.keydelay=3;
if(ed.dmtile>=1200) ed.dmtile-=1200;
}
}
else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT])
{
// Shift modifiers
Add Shift+F1/F2/F3 hotkeys Allowing users to reverse cycle tilesets/tilecols/enemies prevents them from having to press the hotkey a zillion times in order to get to the one they want if the one they want just happens to be behind the current one they're on.
2020-07-01 06:53:11 +02:00
if (key.keymap[SDLK_F1])
{
ed.switch_tileset(true);
graphics.backgrounddrawn = false;
ed.keydelay = 6;
}
if (key.keymap[SDLK_F2])
{
ed.switch_tilecol(true);
graphics.backgrounddrawn = false;
ed.keydelay = 6;
}
if (key.keymap[SDLK_F3])
{
ed.switch_enemy(true);
ed.keydelay=6;
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if (up_pressed || down_pressed || left_pressed || right_pressed)
{
ed.keydelay=6;
if(up_pressed)
{
ed.mapheight--;
}
else if(down_pressed)
{
ed.mapheight++;
}
else if(left_pressed)
{
ed.mapwidth--;
}
else if(right_pressed)
{
ed.mapwidth++;
}
if(ed.mapwidth<1) ed.mapwidth=1;
if(ed.mapheight<1) ed.mapheight=1;
if(ed.mapwidth>=ed.maxwidth) ed.mapwidth=ed.maxwidth;
if(ed.mapheight>=ed.maxheight) ed.mapheight=ed.maxheight;
ed.note = "Mapsize is now [" + help.String(ed.mapwidth) + "," + help.String(ed.mapheight) + "]";
ed.notedelay=45;
}
if(!ed.shiftkey)
{
if(ed.shiftmenu)
{
ed.shiftmenu=false;
}
else
{
ed.shiftmenu=true;
}
}
ed.shiftkey=true;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
else
{
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
// No modifiers
ed.shiftkey=false;
if(key.keymap[SDLK_F1])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
ed.switch_tileset();
graphics.backgrounddrawn = false;
ed.keydelay = 6;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_F2])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
ed.switch_tilecol();
graphics.backgrounddrawn = false;
ed.keydelay = 6;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_F3])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Abstract tileset/tilecol/enemy switching to functions This results in me having to copy-paste less code around, because editorinput() is big enough as it is.
2020-07-01 06:39:10 +02:00
ed.switch_enemy();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.keydelay=6;
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_F4])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.keydelay=6;
ed.boundarytype=1;
ed.boundarymod=1;
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_F5])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.keydelay=6;
ed.boundarytype=2;
ed.boundarymod=1;
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_F10])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(ed.getroomprop(ed.levx, ed.levy)->directmode==1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.setroomdirectmode(ed.levx, ed.levy, 0);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.note="Direct Mode Disabled";
}
else
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.setroomdirectmode(ed.levx, ed.levy, 1);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.note="Direct Mode Enabled";
}
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.backgrounddrawn=false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.notedelay=45;
ed.updatetiles=true;
ed.keydelay=6;
}
if(key.keymap[SDLK_1]) ed.drawmode=0;
if(key.keymap[SDLK_2]) ed.drawmode=1;
if(key.keymap[SDLK_3]) ed.drawmode=2;
if(key.keymap[SDLK_4]) ed.drawmode=3;
if(key.keymap[SDLK_5]) ed.drawmode=4;
if(key.keymap[SDLK_6]) ed.drawmode=5;
if(key.keymap[SDLK_7]) ed.drawmode=6;
if(key.keymap[SDLK_8]) ed.drawmode=7;
if(key.keymap[SDLK_9]) ed.drawmode=8;
if(key.keymap[SDLK_0]) ed.drawmode=9;
if(key.keymap[SDLK_r]) ed.drawmode=10;
if(key.keymap[SDLK_t]) ed.drawmode=11;
if(key.keymap[SDLK_y]) ed.drawmode=12;
if(key.keymap[SDLK_u]) ed.drawmode=13;
if(key.keymap[SDLK_i]) ed.drawmode=14;
if(key.keymap[SDLK_o]) ed.drawmode=15;
if(key.keymap[SDLK_p]) ed.drawmode=16;
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_w])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.setroomwarpdir(ed.levx, ed.levy, (ed.getroomprop(ed.levx, ed.levy)->warpdir+1)%4);
if(ed.getroomprop(ed.levx, ed.levy)->warpdir==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
ed.note="Room warping disabled";
ed.notedelay=45;
graphics.backgrounddrawn=false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(ed.getroomprop(ed.levx, ed.levy)->warpdir==1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
ed.note="Room warps horizontally";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.notedelay=45;
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
graphics.backgrounddrawn=false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(ed.getroomprop(ed.levx, ed.levy)->warpdir==2)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
ed.note="Room warps vertically";
ed.notedelay=45;
graphics.backgrounddrawn=false;
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
else if(ed.getroomprop(ed.levx, ed.levy)->warpdir==3)
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
{
ed.note="Room warps in all directions";
ed.notedelay=45;
graphics.backgrounddrawn=false;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
ed.keydelay=6;
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_e])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.keydelay = 6;
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.getlin(TEXT_ROOMNAME, "Enter new room name:", const_cast<std::string*>(&(ed.getroomprop(ed.levx, ed.levy)->roomname)));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.mapheld=true;
}
Add G keybind to go to room Ved has this useful feature where instead of having to manually travel to a room whose coordinates you know, you can just press G and type in coordinates to go there. VCE added this, but I changed the text to be "x,y" instead of "(x,y)" because otherwise it could confuse someone into thinking they need to type parentheses when in reality they don't need to and typing them will just make it not work. Also I made sure to add an error message if the user types in an invalid format. Failing silently would just confuse people, and maybe they'll start thinking the feature doesn't work or something like that. VCE doesn't have this helpful error message. Lastly, VCE has a bug where if you use the shortcut to go from one horizontally/vertically warping room to another, the background of the previous room will still be there and scroll off with the background of the room you went to, instead of just having the new background only. This is because they forgot a 'graphics.backgrounddrawn = false;'. But don't worry, *I* didn't forget about it.
2020-07-01 08:35:59 +02:00
if (key.keymap[SDLK_g])
{
ed.keydelay = 6;
ed.getlin(TEXT_GOTOROOM, "Enter room coordinates x,y:", NULL);
game.mapheld=true;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
//Save and load
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_s])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.keydelay = 6;
ed.getlin(TEXT_SAVE, "Enter map filename to save map as:", &(ed.filename));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.mapheld=true;
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_l])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.keydelay = 6;
ed.getlin(TEXT_LOAD, "Enter map filename to load:", &(ed.filename));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.mapheld=true;
}
if(!game.press_map) game.mapheld=false;
if (!game.mapheld)
{
if(game.press_map)
{
game.mapheld=true;
//Ok! Scan the room for the closest checkpoint
int testeditor=-1;
int startpoint=0;
//First up; is there a start point on this screen?
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i=0; i<edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//if() on screen
if(edentity[i].t==16 && testeditor==-1)
{
int tx=(edentity[i].x-(edentity[i].x%40))/40;
int ty=(edentity[i].y-(edentity[i].y%30))/30;
if(tx==ed.levx && ty==ed.levy)
{
testeditor=i;
startpoint=1;
}
}
}
if(testeditor==-1)
{
//Ok, settle for a check point
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i=0; i<edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//if() on screen
if(edentity[i].t==10 && testeditor==-1)
{
int tx=(edentity[i].x-(edentity[i].x%40))/40;
int ty=(edentity[i].y-(edentity[i].y%30))/30;
if(tx==ed.levx && ty==ed.levy)
{
testeditor=i;
}
}
}
}
if(testeditor==-1)
{
ed.note="ERROR: No checkpoint to spawn at";
ed.notedelay=45;
}
else
{
Add a player trail to the editor (ghosts) A few months ago, I added ghosts to the VVVVVV: Community Edition editor. I was told recently I should think about upstreaming it, and with Terry saying go ahead I finally ported them into VVVVVV. There's one slight difference however--you can choose whether you have them or not in the editor's settings menu. They're off by default, and this is saved to the save file. Anyway, when you're playtesting, the game saves the players position, color, room coordinates and sprite every 3 frames. The max is 100, where if it tries to add more, the oldest one gets removed. When you exit playtesting, the saved positions appear one at a time, and you can use the Z key to speed it up. [Here's a video of them in action.](https://o.lol-sa.me/4H21zCv.mp4)
2020-06-13 00:04:35 +02:00
ed.currentghosts = 0;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(startpoint==0)
{
//Checkpoint spawn
int tx=(edentity[testeditor].x-(edentity[testeditor].x%40))/40;
int ty=(edentity[testeditor].y-(edentity[testeditor].y%30))/30;
Fix checkpoint starts in editor
2020-07-29 19:54:22 +02:00
game.edsavex = (edentity[testeditor].x%40)*8 - 4;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.edsavey = (edentity[testeditor].y%30)*8;
game.edsaverx = 100+tx;
game.edsavery = 100+ty;
Fix spawning from an exotic checkpoint setting invalid gravitycontrol An exotic checkpoint is a checkpoint with a sprite that is neither the flipped checkpoint nor unflipped checkpoint. More specifically, it's a checkpoint whose edentity p1 attribute is something other than 0 or 1. Normally, whenever you touch an exotic checkpoint in-game, your savepoint's y-position and gravitycontrol don't get touched. However, in the editor, spawning from an exotic checkpoint means that your gravitycontrol gets set to a value that is neither 0 nor 1. In this invalid gravitycontrol state, Viridian is treated like they're flipped, but they cannot unflip. This is an inconsistency between the editor and in-game, so I'm fixing it. Now, spawning from an exotic checkpoint in the editor will just set your gravitycontrol to 0, i.e. unflipped.
2020-10-06 08:04:58 +02:00
if (edentity[testeditor].p1 == 0) // NOT a bool check!
{
game.edsavegc = 1;
Fix inconsistencies with y-positions of spawns It seems like the start point of a custom level and all checkpoints in the game end up putting your spawn point one pixel away from the surface it touches, which seems like an oversight. I'm going to enforce some consistency here and make it so that all spawn points, whenever you start from a start point or a checkpoint, will always be correctly positioned flush with the surface they're standing on, and not one pixel more or less than that.
2020-10-06 08:13:07 +02:00
game.edsavey -= 2;
Fix spawning from an exotic checkpoint setting invalid gravitycontrol An exotic checkpoint is a checkpoint with a sprite that is neither the flipped checkpoint nor unflipped checkpoint. More specifically, it's a checkpoint whose edentity p1 attribute is something other than 0 or 1. Normally, whenever you touch an exotic checkpoint in-game, your savepoint's y-position and gravitycontrol don't get touched. However, in the editor, spawning from an exotic checkpoint means that your gravitycontrol gets set to a value that is neither 0 nor 1. In this invalid gravitycontrol state, Viridian is treated like they're flipped, but they cannot unflip. This is an inconsistency between the editor and in-game, so I'm fixing it. Now, spawning from an exotic checkpoint in the editor will just set your gravitycontrol to 0, i.e. unflipped.
2020-10-06 08:04:58 +02:00
}
else
{
game.edsavegc = 0;
Fix inconsistencies with y-positions of spawns It seems like the start point of a custom level and all checkpoints in the game end up putting your spawn point one pixel away from the surface it touches, which seems like an oversight. I'm going to enforce some consistency here and make it so that all spawn points, whenever you start from a start point or a checkpoint, will always be correctly positioned flush with the surface they're standing on, and not one pixel more or less than that.
2020-10-06 08:13:07 +02:00
game.edsavey -= 7;
Fix spawning from an exotic checkpoint setting invalid gravitycontrol An exotic checkpoint is a checkpoint with a sprite that is neither the flipped checkpoint nor unflipped checkpoint. More specifically, it's a checkpoint whose edentity p1 attribute is something other than 0 or 1. Normally, whenever you touch an exotic checkpoint in-game, your savepoint's y-position and gravitycontrol don't get touched. However, in the editor, spawning from an exotic checkpoint means that your gravitycontrol gets set to a value that is neither 0 nor 1. In this invalid gravitycontrol state, Viridian is treated like they're flipped, but they cannot unflip. This is an inconsistency between the editor and in-game, so I'm fixing it. Now, spawning from an exotic checkpoint in the editor will just set your gravitycontrol to 0, i.e. unflipped.
2020-10-06 08:04:58 +02:00
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.edsavedir = 0;
}
else
{
//Start point spawn
int tx=(edentity[testeditor].x-(edentity[testeditor].x%40))/40;
int ty=(edentity[testeditor].y-(edentity[testeditor].y%30))/30;
Fix checkpoint starts in editor
2020-07-29 19:54:22 +02:00
game.edsavex = (edentity[testeditor].x%40)*8 - 4;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.edsavey = (edentity[testeditor].y%30)*8;
game.edsaverx = 100+tx;
game.edsavery = 100+ty;
game.edsavegc = 0;
Fix inconsistencies with y-positions of spawns It seems like the start point of a custom level and all checkpoints in the game end up putting your spawn point one pixel away from the surface it touches, which seems like an oversight. I'm going to enforce some consistency here and make it so that all spawn points, whenever you start from a start point or a checkpoint, will always be correctly positioned flush with the surface they're standing on, and not one pixel more or less than that.
2020-10-06 08:13:07 +02:00
game.edsavey++;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
game.edsavedir=1-edentity[testeditor].p1;
}
Remove duplicate function musicclass::stopmusic() It is an exact duplicate of musicclass::haltdasmusik(), so use that function instead and update callers. Looks like musicclass::haltdasmusik() came first, anyway (musicclass::stopmusic() was only used in editor.cpp).
2020-04-04 00:44:04 +02:00
music.haltdasmusik();
Remove global args from editorclass This removes global arg passing from all functions on editorclass. Callers have been updated correspondingly. Additionally, all 'dwgfx' has been replaced with 'graphics' in editor.cpp.
2020-03-31 21:52:10 +02:00
graphics.backgrounddrawn=false;
Make "[Press ENTER to return to editor]" fade out after a bit This makes the "[Press ENTER to return to editor]" fade out after a few frames, allowing screenshots of custom levels to be cleaner and to make sure nothing is obscured while the user is editing their level. This commit also adds alpha support in BlitSurfaceColoured, where it takes into account the alpha of the pixel *and* the alpha of the color. `graphics::getRGBA(r,g,b,a)` was added to help with this.
2020-02-10 03:23:12 +01:00
ed.returneditoralpha = 1000; // Let's start it higher than 255 since it gets clamped
Smoothly interpolate "[Press ENTER to return to editor]" fadeout Now it'll be real smooth at 60 FPS. Or above. Or whichever one you want above 30.
2020-05-02 19:49:41 +02:00
ed.oldreturneditoralpha = 1000;
Remove global args from scriptclass This commit removes all global args from the parameters of each function on the scriptclass object, and updates all places they are called accordingly. It also changes all instances of 'dwgfx' to 'graphics' in Script.cpp. Interestingly enough, it looks like editor.h depended on Script.h's class define of the musicclass. I've temporarily placed the class define in editor.h, but by the end of this patchset it'll be gone.
2020-03-31 21:38:52 +02:00
script.startgamemode(21);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
ed.hmod = key.keymap[SDLK_h];
ed.vmod = key.keymap[SDLK_v];
ed.bmod = key.keymap[SDLK_b];
ed.cmod = key.keymap[SDLK_c];
ed.xmod = key.keymap[SDLK_x];
ed.zmod = key.keymap[SDLK_z];
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(key.keymap[SDLK_COMMA])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
ed.drawmode--;
ed.keydelay=6;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
else if(key.keymap[SDLK_PERIOD])
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
ed.drawmode++;
ed.keydelay=6;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(ed.drawmode<0)
{
ed.drawmode=16;
if(ed.spacemod) ed.spacemenu=0;
}
if(ed.drawmode>16) ed.drawmode=0;
if(ed.drawmode>9)
{
if(ed.spacemod) ed.spacemenu=1;
}
else
{
if(ed.spacemod) ed.spacemenu=0;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(up_pressed)
{
ed.keydelay=6;
graphics.backgrounddrawn=false;
ed.levy--;
ed.updatetiles=true;
ed.changeroom=true;
}
else if(down_pressed)
{
ed.keydelay=6;
graphics.backgrounddrawn=false;
ed.levy++;
ed.updatetiles=true;
ed.changeroom=true;
}
else if(left_pressed)
{
ed.keydelay=6;
graphics.backgrounddrawn=false;
ed.levx--;
ed.updatetiles=true;
ed.changeroom=true;
}
else if(right_pressed)
{
ed.keydelay=6;
graphics.backgrounddrawn=false;
ed.levx++;
ed.updatetiles=true;
ed.changeroom=true;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Re-organize editor shortcuts logic Previously, it was: if (ed.settingsmod) { (Settings menu controls) ... } else { (Literally everything else Also a bunch of copy-pasted ed.keydelay checks) ... } Now it is: if (ed.settingsmod) { (Settings menu controls) ... } else if (ed.keydelay > 0) { ed.keydelay--; } else if (key.keymap[SDLK_LCTRL] || key.keymap[SDLK_RCTRL]) { // Ctrl modifiers ... } else if (key.keymap[SDLK_LSHIFT] || key.keymap[SDLK_RSHIFT]) { // Shift modifiers ... } else { // No modifiers ed.shiftkey = false; ... } It might not counteract how completely huge this code is, but it's at least organized better. Also, I had to change the map resize logic around slightly, else it'll get triggered any time you do a shift modifier keypress.
2020-07-01 05:39:36 +02:00
if(ed.levx<0) ed.levx+=ed.mapwidth;
if(ed.levx>= ed.mapwidth) ed.levx-=ed.mapwidth;
if(ed.levy<0) ed.levy+=ed.mapheight;
if(ed.levy>=ed.mapheight) ed.levy-=ed.mapheight;
if(key.keymap[SDLK_SPACE])
{
ed.spacemod = !ed.spacemod;
ed.keydelay=6;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
if(!ed.settingsmod)
{
if(ed.boundarymod>0)
{
if(key.leftbutton)
{
if(ed.lclickdelay==0)
{
if(ed.boundarymod==1)
{
ed.lclickdelay=1;
ed.boundx1=(ed.tilex*8);
ed.boundy1=(ed.tiley*8);
ed.boundarymod=2;
}
else if(ed.boundarymod==2)
{
Fix attempts to place enemy/plat bounds & scripts with bad corner order There is a certain ordering of which corners you click on to place enemy and platform boundaries, and script boxes. You must first click on the top-left corner, then click on the bottom-right corner. The visual box that is drawn after you've first clicked on the top-left corner clearly shows this intended way of doing things. However, it seems like despite the visuals, the game didn't properly prevent you from clicking on the corners in the wrong way. If you placed it from top-right to bottom-left, or bottom-left to top-right, then the game would place the boxes accordingly, and they would have a weird shape where two of its opposite sides would just be missing. But, placing them from bottom-right to top-left is prevented accordingly. The bug comes down to a simple use of "or", instead of the correct "and". This isn't the first time the wrong conjunction was used in a conditional... (8260bb2696f4843b3e6a29b0c4deea7ba6779aea, #136) Since the code block that the if-statement guards is the code that will execute if the corners placed were correct, the if-statement thus should be written in the positive case and use a more restrictive "and", instead of the negative case, which would use a more looser "or". There are less cases that are correct than cases which are incorrect - in this case, there is only 1 correct way of doing things (top-left to bottom-right), compared to 3 incorrect ways of doing things (top-right to bottom-left, bottom-left to top-right, bottom-right to top-left) - so when thinking of positive cases, you should be using "and". Or, you can always just test it. This bug has been in the game since 2.0, so it seems like no one just tested that incorrect input actually didn't work.
2021-01-09 09:27:53 +01:00
if((ed.tilex*8)+8>=ed.boundx1 && (ed.tiley*8)+8>=ed.boundy1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.boundx2=(ed.tilex*8)+8;
ed.boundy2=(ed.tiley*8)+8;
}
else
{
ed.boundx2=ed.boundx1+8;
ed.boundy2=ed.boundy1+8;
}
if(ed.boundarytype==0)
{
//Script trigger
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.lclickdelay=1;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
ed.textent=edentity.size();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
addedentity((ed.boundx1/8)+(ed.levx*40),(ed.boundy1/8)+ (ed.levy*30),19,
(ed.boundx2-ed.boundx1)/8, (ed.boundy2-ed.boundy1)/8);
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.getlin(TEXT_SCRIPT, "Enter script name:", &(edentity[ed.textent].scriptname));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.lclickdelay=1;
}
else if(ed.boundarytype==1)
{
//Enemy bounds
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.setroomenemyx1(ed.levx, ed.levy, ed.boundx1);
ed.setroomenemyy1(ed.levx, ed.levy, ed.boundy1);
ed.setroomenemyx2(ed.levx, ed.levy, ed.boundx2);
ed.setroomenemyy2(ed.levx, ed.levy, ed.boundy2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(ed.boundarytype==2)
{
//Platform bounds
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.setroomplatx1(ed.levx, ed.levy, ed.boundx1);
ed.setroomplaty1(ed.levx, ed.levy, ed.boundy1);
ed.setroomplatx2(ed.levx, ed.levy, ed.boundx2);
ed.setroomplaty2(ed.levx, ed.levy, ed.boundy2);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(ed.boundarytype==3)
{
//Copy
}
ed.boundarymod=0;
ed.lclickdelay=1;
}
}
}
else
{
ed.lclickdelay=0;
}
if(key.rightbutton)
{
ed.boundarymod=0;
}
}
else if(ed.warpmod)
{
//Placing warp token
if(key.leftbutton)
{
if(ed.lclickdelay==0)
{
if(ed.free(ed.tilex, ed.tiley)==0)
{
edentity[ed.warpent].p1=ed.tilex+(ed.levx*40);
edentity[ed.warpent].p2=ed.tiley+(ed.levy*30);
ed.warpmod=false;
ed.warpent=-1;
ed.lclickdelay=1;
}
}
}
else
{
ed.lclickdelay=0;
}
if(key.rightbutton)
{
removeedentity(ed.warpent);
ed.warpmod=false;
ed.warpent=-1;
}
}
else
{
//Mouse input
if(key.leftbutton)
{
if(ed.lclickdelay==0)
{
//Depending on current mode, place something
if(ed.drawmode==0)
{
//place tiles
//Are we in direct mode?
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(ed.getroomprop(ed.levx, ed.levy)->directmode>=1)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
if(ed.bmod)
{
for(int i=0; i<30; i++)
{
ed.placetilelocal(ed.tilex, i, ed.dmtile);
}
}
else if(ed.hmod)
{
for(int i=0; i<40; i++)
{
ed.placetilelocal(i, ed.tiley, ed.dmtile);
}
}
else if(ed.vmod)
{
for(int j=-4; j<5; j++)
{
for(int i=-4; i<5; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, ed.dmtile);
}
}
}
else if(ed.cmod)
{
for(int j=-3; j<4; j++)
{
for(int i=-3; i<4; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, ed.dmtile);
}
}
}
else if(ed.xmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for(int j=-2; j<3; j++)
{
for(int i=-2; i<3; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, ed.dmtile);
}
}
}
else if(ed.zmod)
{
for(int j=-1; j<2; j++)
{
for(int i=-1; i<2; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, ed.dmtile);
}
}
}
else
{
ed.placetilelocal(ed.tilex, ed.tiley, ed.dmtile);
}
}
else
{
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
if(ed.bmod)
{
for(int i=0; i<30; i++)
{
ed.placetilelocal(ed.tilex, i, 80);
}
}
else if(ed.hmod)
{
for(int i=0; i<40; i++)
{
ed.placetilelocal(i, ed.tiley, 80);
}
}
else if(ed.vmod)
{
for(int j=-4; j<5; j++)
{
for(int i=-4; i<5; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 80);
}
}
}
else if(ed.cmod)
{
for(int j=-3; j<4; j++)
{
for(int i=-3; i<4; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 80);
}
}
}
else if(ed.xmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for(int j=-2; j<3; j++)
{
for(int i=-2; i<3; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 80);
}
}
}
else if(ed.zmod)
{
for(int j=-1; j<2; j++)
{
for(int i=-1; i<2; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 80);
}
}
}
else
{
ed.placetilelocal(ed.tilex, ed.tiley, 80);
}
}
}
else if(ed.drawmode==1)
{
//place background tiles
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
if(ed.bmod)
{
for(int i=0; i<30; i++)
{
ed.placetilelocal(ed.tilex, i, 2);
}
}
else if(ed.hmod)
{
for(int i=0; i<40; i++)
{
ed.placetilelocal(i, ed.tiley, 2);
}
}
else if(ed.vmod)
{
for(int j=-4; j<5; j++)
{
for(int i=-4; i<5; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 2);
}
}
}
else if(ed.cmod)
{
for(int j=-3; j<4; j++)
{
for(int i=-3; i<4; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 2);
}
}
}
else if(ed.xmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
for(int j=-2; j<3; j++)
{
for(int i=-2; i<3; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 2);
}
}
}
else if(ed.zmod)
{
for(int j=-1; j<2; j++)
{
for(int i=-1; i<2; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 2);
}
}
}
else
{
ed.placetilelocal(ed.tilex, ed.tiley, 2);
}
}
else if(ed.drawmode==2)
{
//place spikes
ed.placetilelocal(ed.tilex, ed.tiley, 8);
}
int tmp=edentat(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30));
if(tmp==-1)
{
//Room text and script triggers can be placed in walls
if(ed.drawmode==10)
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.lclickdelay=1;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
ed.textent=edentity.size();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),17);
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.getlin(TEXT_ROOMTEXT, "Enter roomtext:", &(edentity[ed.textent].scriptname));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(ed.drawmode==12) //Script Trigger
{
ed.boundarytype=0;
ed.boundx1=ed.tilex*8;
ed.boundy1=ed.tiley*8;
ed.boundarymod=2;
ed.lclickdelay=1;
}
}
if(tmp==-1 && ed.free(ed.tilex,ed.tiley)==0)
{
if(ed.drawmode==3)
{
Don't use separate variable for number of trinkets in level Same principle as removing the separate variable to track number of collected trinkets. This means it's less error-prone as we're no longer tracking number of trinkets separately. In the function that counts the number of trinkets, I would've liked to have used std::count_if(). However, the most optimal way would require using a lambda, and lambdas are too new for the C++ standard we're using. So I just bit the bullet and counted them manually.
2020-04-09 07:09:11 +02:00
if(ed.numtrinkets()<100)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),9);
ed.lclickdelay=1;
}
else
{
Up the trinkets/crewmates limit to 100 2.2 will handle this just fine, because there are 100 slots allocated for trinkets and crewmates, and it will save and load all 100 slots just fine. Except, it only resets the first 20 slots when starting a level from the beginning, but that's minor and already fixed in 2.3 anyway. This commit makes it so you can now place up to one hundred trinkets and crewmates in the editor.
2020-01-23 15:43:53 +01:00
ed.note="ERROR: Max number of trinkets is 100";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.notedelay=45;
}
}
else if(ed.drawmode==4)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),10, 1);
ed.lclickdelay=1;
}
else if(ed.drawmode==5)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),3);
ed.lclickdelay=1;
}
else if(ed.drawmode==6)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),2,5);
ed.lclickdelay=1;
}
else if(ed.drawmode==7)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),2,0);
ed.lclickdelay=1;
}
else if(ed.drawmode==8)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),1,0);
ed.lclickdelay=1;
}
else if(ed.drawmode==9)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),11,0);
ed.lclickdelay=1;
}
else if(ed.drawmode==11)
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.lclickdelay=1;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
ed.textent=edentity.size();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
addedentity(ed.tilex+(ed.levx*40),ed.tiley+ (ed.levy*30),18,0);
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.getlin(TEXT_SCRIPT, "Enter script name", &(edentity[ed.textent].scriptname));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else if(ed.drawmode==13)
{
ed.warpmod=true;
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
ed.warpent=edentity.size();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),13);
ed.lclickdelay=1;
}
else if(ed.drawmode==14)
{
//Warp lines
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
if(ed.tilex==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),50,0);
}
else if(ed.tilex==39)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),50,1);
}
else if(ed.tiley==0)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),50,2);
}
else if(ed.tiley==29)
{
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),50,3);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
Remove checks to prevent having both warp lines/BGs in editor It's perfectly acceptable to have both warp lines and a warping background in the same room. Many levels do this exact thing, I would say at least 30 or so levels, many of them popular and played by many, and this has never caused any issues at all. All that having both warp lines and warp BG does is make it so the warping of the warping background gets overriden by the warp lines, but make it so the background is still a warp background. So in effect, you can have a warp background without any warping. This is perfectly defined behavior. Except, for whatever reason, it's unintentional, and the editor tries to prevent you from doing it. Key word being "tries". The code to prevent having both warp types is bugged (at least when you change the warp BG. The check when you place warp lines seems to be solid). It compares the p1 and p2 attributes of warp lines to the x-coordinate and y-coordinate of the room, despite p1 and p2 having nothing to do with room coordinates. p1 is the type of the warp line and should be treated as an enum, and p2 is the offset of the warp line from the top/left of the screen. This results in this check sometimes working if you're unlucky, but never actually working properly most of the time. This means people can first place warp lines, and then change the warp background later, to have both warp lines and a warp background. Having these checks just further complicates the code, makes it more error-prone, and just inconveniences people when they want to do something that's perfectly fine to do. So it's best if we just remove these checks.
2020-09-06 05:02:27 +02:00
ed.note="ERROR: Warp lines must be on edges";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.notedelay=45;
}
ed.lclickdelay=1;
}
else if(ed.drawmode==15) //Crewmate
{
Don't use separate variable for number of crewmates in level Same as previous commit, this time for crewmates.
2020-04-09 07:13:43 +02:00
if(ed.numcrewmates()<100)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Allow crewmate to be cyan when initially placing it down For some reason, the only way to get a cyan crewmate is by cycling through an already-existing crewmate by keeping left-clicking on it. This is because when you cycle through crewmate colors, the allowed colors are 0-5, but when you place down a crewmate, it picks a random color from 1-5, which seems to be a bit consistent. So placing and cycling a crewmate now use the same color ranges.
2020-05-20 03:18:01 +02:00
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),15,int(fRandom() * 6));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.lclickdelay=1;
}
else
{
Up the trinkets/crewmates limit to 100 2.2 will handle this just fine, because there are 100 slots allocated for trinkets and crewmates, and it will save and load all 100 slots just fine. Except, it only resets the first 20 slots when starting a level from the beginning, but that's minor and already fixed in 2.3 anyway. This commit makes it so you can now place up to one hundred trinkets and crewmates in the editor.
2020-01-23 15:43:53 +01:00
ed.note="ERROR: Max number of crewmates is 100";
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.notedelay=45;
}
}
else if(ed.drawmode==16) //Start Point
{
//If there is another start point, destroy it
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i=0; i<edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(edentity[i].t==16)
{
removeedentity(i);
i--;
}
}
addedentity(ed.tilex+ (ed.levx*40),ed.tiley+ (ed.levy*30),16,0);
ed.lclickdelay=1;
}
}
Fix undefined behavior with left-click logic in editor There's an if-else chain that first deals with figuring out if there's an entity where your left-click happened, and to do this it uses edentat(), which returns a sentinel value of -1 if there is NOT an entity where your cursor is. It's very important to check that the value returned ISN'T -1 before you start indexing the 'edentity' vector, since if you DO index it with that -1, it'll result in Undefined Behavior because you're doing an out-of-bounds array access. Now, here's what the if-else chain looked like before: if(tmp==-1 && ed.free(ed.tilex,ed.tiley)==0) { ... } else if(edentity[tmp].t==1) The bug here is very subtle but it was an easy oversight. Basically, if 'ed.free' ended up not being zero, control flow would jump to the next "else if" over, which then ends up asking for the -1th index of 'edentity', which is Undefined Behavior. This undefined behavior has now resulted in a crash on my system after TerryCavanagh/VVVVVV#172, due it shuffling things around juuuuust enough such that this UB would end up resulting in a segfault instead of chugging along and working fine. For me and my system, this meant that if my first left-click in the editor upon opening the game was me placing down a tile and not placing down an entity, the game would crash. But, it would be fine if I first placed down an entity and then afterwards placed down tiles, because it's UB. And I'm almost certain this was the cause of the very strange bug where you couldn't hold down left-click for the foreground-placing tool (but you COULD for the background-placing tool) that seemed to occur most often on Windows (TerryCavanagh/VVVVVV#25). The solution to this is to stick in another conditional in the tree before any indexing occurs, such that there's no way any other conditionals with the indexing in the conditional tree could end up being hit. In summary, the if-else chain looks like this now: if(tmp==-1 && ed.free(ed.tilex,ed.tiley)==0) { ... } else if(tmp == -1) { //Important! Do nothing, or else Undefined Behavior will happen } else if(edentity[tmp].t==1)
2020-03-02 06:25:29 +01:00
else if(tmp == -1)
{
//Important! Do nothing, or else Undefined Behavior will happen
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
else if(edentity[tmp].t==1)
{
edentity[tmp].p1=(edentity[tmp].p1+1)%4;
ed.lclickdelay=1;
}
else if(edentity[tmp].t==2)
{
if(edentity[tmp].p1>=5)
{
edentity[tmp].p1=(edentity[tmp].p1+1)%9;
if(edentity[tmp].p1<5) edentity[tmp].p1=5;
}
else
{
edentity[tmp].p1=(edentity[tmp].p1+1)%4;
}
ed.lclickdelay=1;
}
else if(edentity[tmp].t==10)
{
Improve support for retextured checkpoints and terminals in the editor Retextured checkpoints have always been in the game, but clicking on them in the editor would lead to them losing their retextured-ness. So, checkpoints should be left alone if their p1 isn't either 0 or 1. Also, they don't show up properly in the editor, so that's fixed, too. Retextured and flipped terminals were added in 2.3, and show up properly in-game, but don't properly show up in the editor, either. So now they show up in the editor. Additionally, clicking on them will flip the terminal as well, but only if its p1 is 0 or 1, just like checkpoints now do.
2021-01-12 02:19:20 +01:00
// If it's not textured as a checkpoint, leave it alone
if (edentity[tmp].p1 == 0 || edentity[tmp].p1 == 1)
{
edentity[tmp].p1=(edentity[tmp].p1+1)%2;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.lclickdelay=1;
}
else if(edentity[tmp].t==11)
{
edentity[tmp].p1=(edentity[tmp].p1+1)%2;
ed.lclickdelay=1;
}
else if(edentity[tmp].t==15)
{
edentity[tmp].p1=(edentity[tmp].p1+1)%6;
ed.lclickdelay=1;
}
else if(edentity[tmp].t==16)
{
edentity[tmp].p1=(edentity[tmp].p1+1)%2;
ed.lclickdelay=1;
}
else if(edentity[tmp].t==17)
{
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.getlin(TEXT_ROOMTEXT, "Enter roomtext:", &(edentity[tmp].scriptname));
Fix and improve handling of cancelling roomtext/scripttext input First, two bug fixes. Room text input mode wasn't properly unset upon pressing Esc, making the prompt get stuck, requiring you to add roomtext again and finish it to make it go away. Secondly, escaping script text input would remove the wrong entity. I also tweaked the handling slightly so that instead of deleting the entity if it already existed if escaping from text input, it merely reverts the change in script name/roomtext to what it was previously. I considered refactoring the editor text input handler entirely, but figured such a change would be a bit too extensive for the purpose of this repository.
2020-01-27 11:15:25 +01:00
ed.textent=tmp;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
ed.lclickdelay=1;
}
Fix left-clicking on script boxes You can now left-click on script boxes in order to change their script.
2020-02-21 22:23:04 +01:00
else if(edentity[tmp].t==18 || edentity[tmp].t==19)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.lclickdelay=1;
Refactor/de-duplicate entity text input This is basically FIQ's patch from VCE, except he never upstreamed it because he said something along the lines of it seeming to not fit the purpose of upstream. But anyway, it basically just de-duplicates all the text input and text finishing handling code and cuts down on the large amount of copy-paste in the editor functions. It makes things way more maintainable. Interesting note, it seems like FIQ had the intent to refactor the text input in editor settings (i.e. the level metadata details), but never got around to it in VCE. Maybe we'll finish that job for him later.
2020-07-01 08:17:26 +02:00
ed.textent=tmp;
ed.getlin(TEXT_SCRIPT, "Enter script name:", &(edentity[ed.textent].scriptname));
Improve support for retextured checkpoints and terminals in the editor Retextured checkpoints have always been in the game, but clicking on them in the editor would lead to them losing their retextured-ness. So, checkpoints should be left alone if their p1 isn't either 0 or 1. Also, they don't show up properly in the editor, so that's fixed, too. Retextured and flipped terminals were added in 2.3, and show up properly in-game, but don't properly show up in the editor, either. So now they show up in the editor. Additionally, clicking on them will flip the terminal as well, but only if its p1 is 0 or 1, just like checkpoints now do.
2021-01-12 02:19:20 +01:00
if (edentity[tmp].t == 18
&& (edentity[tmp].p1 == 0 || edentity[tmp].p1 == 1))
{
// Flip the terminal, but if it's not textured as a terminal leave it alone
edentity[tmp].p1 = (edentity[tmp].p1 + 1) % 2;
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
else
{
ed.lclickdelay=0;
}
if(key.rightbutton)
{
//place tiles
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
if(ed.drawmode < 2) {
if(ed.bmod)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int i=0; i<30; i++)
{
ed.placetilelocal(ed.tilex, i, 0);
}
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.hmod)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int i=0; i<40; i++)
{
ed.placetilelocal(i, ed.tiley, 0);
}
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.vmod)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int j=-4; j<5; j++)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int i=-4; i<5; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 0);
}
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.cmod)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int j=-3; j<4; j++)
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int i=-3; i<4; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 0);
}
Add 7x7, 9x9, full horizontal and vertical brush sizes
2020-06-17 23:49:57 +02:00
}
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.xmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int j=-2; j<3; j++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int i=-2; i<3; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 0);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else if(ed.zmod)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int j=-1; j<2; j++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
for(int i=-1; i<2; i++)
{
ed.placetilelocal(ed.tilex+i, ed.tiley+j, 0);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Fix #199 This makes the modifiers for removing tiles only work if you're using tools 0 or 1 (wall or background). In the future it might be worth it to add some extra subtools for spikes, but for now this should be fine. Also, there was a small inconsistency with the tool drawn and the tool used. If you started holding down V, then started holding down Z, you would place tiles like you're holding V (9x9) but your cursor would look like you're holding Z (3x3). The `if` chain for drawing the resized cursors has been flipped around for this.
2020-08-01 21:23:56 +02:00
else
{
ed.placetilelocal(ed.tilex, ed.tiley, 0);
}
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
else
{
ed.placetilelocal(ed.tilex, ed.tiley, 0);
}
Refactor edentities to not use separate length-trackers This turns the array 'edentity' into a proper vector, and removes the need to use a separate length-tracking variable and manually keep track of the actual amount of edentities in the level by using the long-winded 'EditorData::GetInstance().numedentities'. This manual tracking was more error-prone and much less maintainable. editorclass::naddedentity() has been removed due to now functionally being the same as editorclass::addedentity() (there's no more 'EditorData::GetInstance().numedentities' to not increment) and for also being unused in the first place. editorclass::copyedentity() has been removed because it was only used to shift the rest of the edentities up manually, but now that we let C++ do all the hard work it's no longer necessary.
2020-03-01 21:24:43 +01:00
for(size_t i=0; i<edentity.size(); i++)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if(edentity[i].x==ed.tilex + (ed.levx*40)&& edentity[i].y==ed.tiley+ (ed.levy*30))
{
removeedentity(i);
}
}
}
if(key.middlebutton)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.dmtile=ed.gettile(ed.levx, ed.levy, ed.tilex, ed.tiley);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
}
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
if(ed.updatetiles && ed.getroomprop(ed.levx, ed.levy)->directmode==0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
ed.updatetiles=false;
//Correctly set the tiles in the current room
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch(ed.getroomprop(ed.levx, ed.levy)->tileset)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
case 0: //The Space Station
for(int j=0; j<30; j++)
{
for(int i=0; i<40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
int temp=ed.gettile(ed.levx, ed.levy, i, j);
if(temp>=3 && temp<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix spikes
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(ed.levx, ed.levy, i, j, ed.spikedir(i, j));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp==2 || temp>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix background
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.backedgetile(i, j) + ed.backbase(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp>0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix tiles
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.edgetile(i, j) + ed.base(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
break;
case 1: //Outside
for(int j=0; j<30; j++)
{
for(int i=0; i<40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
int temp=ed.gettile(ed.levx, ed.levy, i, j);
if(temp>=3 && temp<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix spikes
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(ed.levx, ed.levy, i, j, ed.spikedir(i, j));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp==2 || temp>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix background
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.outsideedgetile(i, j) + ed.backbase(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp>0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix tiles
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.edgetile(i, j) + ed.base(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
break;
case 2: //Lab
for(int j=0; j<30; j++)
{
for(int i=0; i<40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
int temp=ed.gettile(ed.levx, ed.levy, i, j);
if(temp>=3 && temp<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix spikes
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.labspikedir(
i,
j,
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
ed.getroomprop(ed.levx, ed.levy)->tilecol
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp==2 || temp>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix background
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(ed.levx, ed.levy, i, j, 713);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp>0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix tiles
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.edgetile(i, j) + ed.base(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
break;
case 3: //Warp Zone/Intermission
for(int j=0; j<30; j++)
{
for(int i=0; i<40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
int temp=ed.gettile(ed.levx, ed.levy, i, j);
if(temp>=3 && temp<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix spikes
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(ed.levx, ed.levy, i, j, ed.spikedir(i, j));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp==2 || temp>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix background
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(ed.levx, ed.levy, i, j, 713);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp>0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix tiles
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.edgetile(i, j) + ed.base(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
break;
case 4: //The ship
for(int j=0; j<30; j++)
{
for(int i=0; i<40; i++)
{
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
int temp=ed.gettile(ed.levx, ed.levy, i, j);
if(temp>=3 && temp<80)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix spikes
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(ed.levx, ed.levy, i, j, ed.spikedir(i, j));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp==2 || temp>=680)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix background
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.backedgetile(i, j) + ed.backbase(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
else if(temp>0)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
//Fix tiles
Refactor tiles to use setter and getter functions This makes it easier to add bounds checks to all accesses of ed.contents. To do this, I've added editorclass::gettile(), editorclass::settile(), and editorclass::getabstile() (with a helper function of editorclass::gettileidx() that really shouldn't be used directly), and replaced all raw accesses of ed.contents with those functions appropriately. This also makes the code more readable, as a side effect.
2021-03-24 19:26:19 +01:00
ed.settile(
ed.levx,
ed.levy,
i,
j,
ed.edgetile(i, j) + ed.base(ed.levx, ed.levy)
);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
}
break;
case 5: //The Tower
break;
case 6: //Custom Set 1
break;
case 7: //Custom Set 2
break;
case 8: //Custom Set 3
break;
case 9: //Custom Set 4
break;
}
}
}
Add '#if !defined(NO_EDITOR)' guards around editorinput/render/logic These functions aren't needed in a NO_EDITOR build, so it's useful to reduce the binary size this way.
2020-06-20 00:23:28 +02:00
#endif /* NO_EDITOR */
Add option to compile without the level editor
2020-02-10 01:53:01 +01:00
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
// Return a graphics-ready color based off of the given tileset and tilecol
// Much kudos to Dav999 for saving me a lot of work, because I stole these colors from const.lua in Ved! -Info Teddy
Uint32 editorclass::getonewaycol(const int rx, const int ry)
{
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
const edlevelclass* const room = getroomprop(rx, ry);
switch (room->tileset) {
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
case 0: // Space Station
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch (room->tilecol) {
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
case -1:
return graphics.getRGB(109, 109, 109);
case 0:
return graphics.getRGB(131, 141, 235);
case 1:
return graphics.getRGB(227, 140, 227);
case 2:
return graphics.getRGB(242, 126, 151);
case 3:
return graphics.getRGB(229, 235, 133);
case 4:
return graphics.getRGB(148, 238, 130);
case 5:
return graphics.getRGB(140, 165, 227);
case 6:
return graphics.getRGB(227, 140, 148);
case 7:
return graphics.getRGB(140, 173, 228);
case 8:
return graphics.getRGB(142, 235, 137);
case 9:
return graphics.getRGB(137, 235, 206);
case 10:
return graphics.getRGB(235, 139, 223);
case 11:
return graphics.getRGB(238, 130, 138);
case 12:
return graphics.getRGB(137, 235, 178);
case 13:
return graphics.getRGB(125, 205, 247);
case 14:
return graphics.getRGB(190, 137, 235);
case 15:
return graphics.getRGB(235, 137, 206);
case 16:
return graphics.getRGB(229, 247, 127);
case 17:
return graphics.getRGB(127, 200, 247);
case 18:
return graphics.getRGB(197, 137, 235);
case 19:
return graphics.getRGB(235, 131, 175);
case 20:
return graphics.getRGB(242, 210, 123);
case 21:
return graphics.getRGB(131, 235, 158);
case 22:
return graphics.getRGB(242, 126, 151);
case 23:
return graphics.getRGB(219, 243, 123);
case 24:
return graphics.getRGB(131, 234, 145);
case 25:
return graphics.getRGB(131, 199, 234);
case 26:
return graphics.getRGB(141, 131, 234);
case 27:
return graphics.getRGB(226, 140, 144);
case 28:
return graphics.getRGB(129, 236, 144);
case 29:
return graphics.getRGB(235, 231, 131);
case 30:
return graphics.getRGB(153, 235, 131);
case 31:
return graphics.getRGB(207, 131, 235);
}
break;
case 1: // Outside
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch (room->tilecol) {
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
case 0:
return graphics.getRGB(57, 86, 140);
case 1:
return graphics.getRGB(156, 42, 42);
case 2:
return graphics.getRGB(42, 156, 155);
case 3:
return graphics.getRGB(125, 36, 162);
case 4:
return graphics.getRGB(191, 198, 0);
case 5:
return graphics.getRGB(0, 198, 126);
case 6:
return graphics.getRGB(224, 110, 177);
case 7:
return graphics.getRGB(255, 142, 87);
}
break;
case 2: // Lab
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch (room->tilecol) {
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
case 0:
return graphics.getRGB(0, 165, 206);
case 1:
return graphics.getRGB(206, 5, 0);
case 2:
return graphics.getRGB(222, 0, 173);
case 3:
return graphics.getRGB(27, 67, 255);
case 4:
return graphics.getRGB(194, 206, 0);
case 5:
return graphics.getRGB(0, 206, 39);
case 6:
return graphics.getRGB(0, 165, 206);
}
break;
case 3: // Warp Zone
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch (room->tilecol) {
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
case 0:
return graphics.getRGB(113, 178, 197);
case 1:
return graphics.getRGB(197, 113, 119);
case 2:
return graphics.getRGB(196, 113, 197);
case 3:
return graphics.getRGB(149, 113, 197);
case 4:
return graphics.getRGB(197, 182, 113);
case 5:
return graphics.getRGB(141, 197, 113);
case 6:
return graphics.getRGB(109, 109, 109);
}
break;
case 4: // Ship
Refactor room properties to use setter and getter funcs This replaces all raw ed.level accesses with new setter and getter funcs, which makes it easier to add bounds checks later. And I've also removed all the manually-written bounds checks, since they will go into the new getter and setter. To get the room properties of a specific room, you use editorclass::getroomprop(), which returns a pointer to the room properties - then you just read off of that pointer. To set a room property, you use editorclass::setroom<PROP>(), where <PROP> is the name of the property. These are maintained using X macros to avoid copy-pasting. editorclass::getroompropidx() is a helper function and shouldn't be used directly.
2021-03-24 19:59:36 +01:00
switch (room->tilecol) {
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
case 0:
return graphics.getRGB(0, 206, 39);
case 1:
return graphics.getRGB(0, 165, 206);
case 2:
return graphics.getRGB(194, 206, 0);
case 3:
return graphics.getRGB(206, 0, 160);
case 4:
return graphics.getRGB(27, 67, 255);
case 5:
return graphics.getRGB(206, 5, 0);
}
break;
}
// Uh, I guess return solid white
return graphics.getRGB(255, 255, 255);
}
// This version detects the room automatically
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
Uint32 editorclass::getonewaycol(void)
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
{
if (game.gamestate == EDITORMODE)
Clean up and prevent unnecessary qualifiers to self By "unnecessary qualifiers to self", I mean something like using the 'game.' qualifier for a variable on the Game class when you're inside a function on the Game class itself. This patch is to enforce consistency as most of the code doesn't have these unnecessary qualifiers. To prevent further unnecessary qualifiers to self, I made it so the extern in each header file can be omitted by using a define. That way, if someone writes something referring to 'game.' on a Game function, there will be a compile error. However, if you really need to have a reference to the global name, and you're within the same .cpp file as the implementation of that object, you can just do the extern at the function-level. A good example of this is editorinput()/editorrender()/editorlogic() in editor.cpp. In my opinion, they should probably be split off into their own separate file because editor.cpp is getting way too big, but this will do for now.
2020-09-28 04:15:06 +02:00
return getonewaycol(levx, levy);
Re-color one-way tiles to match their tileset One-ways have always had this problem where they're always yellow. That means unless you specifically use yellow, it'll never match the tileset. The best way to fix this without requiring new graphics or changing existing ones is to simply re-tint the one-way with the given color of the room. That way, the black part of the tile is still black, but the yellow is now some other color.
2020-06-30 20:47:22 +02:00
else if (map.custommode)
return getonewaycol(game.roomx - 100, game.roomy - 100);
// Uh, I guess return solid white
return graphics.getRGB(255, 255, 255);
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
int editorclass::numtrinkets(void)
Don't use separate variable for number of trinkets in level Same principle as removing the separate variable to track number of collected trinkets. This means it's less error-prone as we're no longer tracking number of trinkets separately. In the function that counts the number of trinkets, I would've liked to have used std::count_if(). However, the most optimal way would require using a lambda, and lambdas are too new for the C++ standard we're using. So I just bit the bullet and counted them manually.
2020-04-09 07:09:11 +02:00
{
int temp = 0;
for (size_t i = 0; i < edentity.size(); i++)
{
if (edentity[i].t == 9)
{
temp++;
}
}
return temp;
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
int editorclass::numcrewmates(void)
Don't use separate variable for number of crewmates in level Same as previous commit, this time for crewmates.
2020-04-09 07:13:43 +02:00
{
int temp = 0;
for (size_t i = 0; i < edentity.size(); i++)
{
if (edentity[i].t == 15)
{
temp++;
}
}
return temp;
}
Prevent removing line if there is only one line This fixes another way you could end up typing on a non-existent line in the script editor. In a script with only 1 line, which is empty, the game would let you press backspace on it, removing the line. This results in you typing on a non-existent line. You will keep typing on it until you either close the script or press Up. If you press Up, you will be unable to get back to the non-existent line, for it doesn't exist - but the text you typed on the non-existent line will still be there, until you close the script and re-open it.
2020-02-11 03:29:29 +01:00
#endif /* NO_CUSTOM_LEVELS */
Reference in a new issue Copy permalink