mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Change all tilemaps to be short[1200] instead of int[1200]

Browse source 
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.
This commit is contained in:
Misa 2020-07-18 21:06:35 -07:00 committed by Ethan Lee
parent df96b2a594
commit 6c85fae339
16 changed files with 460 additions and 460 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
desktop_version/src/Finalclass.cpp
View file

@ -2,12 +2,12 @@
#include "MakeAndPlay.h"
const int* finalclass::loadlevel(int rx, int ry)
const short* finalclass::loadlevel(int rx, int ry)
{
int t;
t = rx + (ry * 100);
const int* result;
const short* result;
warpx = false;
warpy = false;
@ -19,7 +19,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(50,52):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,98,98,98,
259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,0,0,0,0,0,0,0,258,259,259,259,
@ -67,7 +67,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(50,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,218,98,220,740,
0,0,0,258,259,259,260,0,0,0,0,0,0,0,258,259,259,260,0,0,0,0,0,0,0,258,259,259,260,0,0,0,0,0,0,0,218,98,220,740,
0,0,0,7,7,7,7,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,218,98,220,740,
@ -116,7 +116,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(49,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,50,218,98,98,220,49,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,50,258,259,259,260,49,0,0,0,0,0,0,0,0,50,258,259,259,260,49,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,7,7,7,7,0,0,0,0,0,0,0,0,0,0,0,
@ -163,7 +163,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(48,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -213,7 +213,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(47,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,258,260,0,0,0,0,0,0,258,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -261,7 +261,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(46,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -311,7 +311,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(45,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,0,0,0,0,0,0,218,220,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,260,0,0,0,0,0,0,258,260,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -359,7 +359,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(44,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -415,7 +415,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(43,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -469,7 +469,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(42,51):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,140,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -516,7 +516,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(41,51):
{
static const int contents[] = {
static const short contents[] = {
740,740,218,98,220,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,218,220,218,98,220,740,740,740,740,740,740,
740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,218,98,220,740,740,740,740,740,740,
740,740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,220,218,98,220,740,740,740,740,740,740,
@ -565,7 +565,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(41,52):
{
static const int contents[] = {
static const short contents[] = {
740,740,218,98,220,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
179,179,140,98,220,0,0,0,0,0,218,98,139,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
98,98,98,98,220,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
@ -623,7 +623,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(42,52):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
@ -664,7 +664,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(43,52):
{
static const int contents[] = {
static const short contents[] = {
218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,
218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,218,98,98,220,258,259,259,260,218,98,98,220,218,98,98,220,218,98,98,220,
218,98,98,220,218,98,98,220,218,98,98,220,258,259,259,260,218,98,98,220,258,259,259,260,0,0,0,0,258,259,259,260,218,98,98,220,218,98,98,220,
@ -712,7 +712,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(44,52):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,220,218,98,98,98,98,98,98,98,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,220,218,98,98,98,98,98,98,98,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,258,259,259,260,258,259,259,259,259,259,259,259,
@ -768,7 +768,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(45,52):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,218,98,98,98,220,218,98,220,740,740,740,740,740,740,
98,98,98,98,98,98,98,220,218,98,220,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,218,98,98,98,220,218,98,220,740,740,740,740,740,740,
259,259,259,259,259,259,259,260,218,98,220,740,740,740,740,740,740,218,98,220,0,0,0,0,0,0,258,259,259,259,260,218,98,139,179,179,179,179,179,179,
@ -813,7 +813,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(47,52):
{
static const int contents[] = {
static const short contents[] = {
740,218,98,220,218,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,218,98,220,258,259,259,259,259,259,259,259,259,260,0,0,0,0,0,0,218,98,139,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
740,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
@ -860,7 +860,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(48,52):
{
static const int contents[] = {
static const short contents[] = {
98,98,220,218,98,98,98,98,98,98,98,98,98,220,218,98,220,218,98,98,98,98,98,98,98,98,98,98,220,218,98,98,98,98,98,98,98,98,98,98,
98,98,220,258,259,259,259,259,259,259,259,259,259,260,218,98,220,258,259,259,259,259,259,259,259,259,259,259,260,218,98,98,98,98,98,98,98,98,98,98,
259,259,260,7,7,7,7,7,7,7,7,7,7,7,258,259,260,7,7,7,7,7,7,7,7,7,7,7,7,258,259,259,259,259,259,259,259,259,259,259,
@ -908,7 +908,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(50,53):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,220,218,98,220,740,740,740,740,740,740,740,
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,220,218,98,139,179,179,179,179,179,179,179,
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,218,220,218,98,98,98,98,98,98,98,98,98,
@ -961,7 +961,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(50,54):
{
static const int contents[] = {
static const short contents[] = {
98,220,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
98,220,0,0,0,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,100,98,
98,220,0,0,0,740,740,7,7,7,7,7,7,7,740,740,740,740,7,7,7,7,7,7,740,740,740,740,7,7,7,7,7,7,7,7,7,7,218,98,
@ -1012,7 +1012,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(52,53):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
@ -1061,7 +1061,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53,53):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,7,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,7,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,7,0,7,740,740,740,740,740,740,740,
@ -1112,7 +1112,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,53):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
@ -1159,7 +1159,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,52):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
@ -1200,7 +1200,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,51):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,740,740,740,
@ -1241,7 +1241,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,50):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,
740,740,740,740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,740,740,740,
@ -1281,7 +1281,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,49):
{
static const int contents[] = {
static const short contents[] = {
740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,
740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,
740,740,740,740,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,740,740,740,740,
@ -1322,7 +1322,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,48):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1376,7 +1376,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(46,54):
{
static const int contents[] = {
static const short contents[] = {
98,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
98,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
98,98,220,258,259,259,259,259,259,259,259,259,259,259,259,259,259,260,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1418,7 +1418,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(47,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1459,7 +1459,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(48,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,139,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
@ -1507,7 +1507,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(49,54):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,220,740,740,740,
98,98,98,98,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,218,98,220,0,0,218,220,0,0,218,98,220,740,740,740,
98,98,98,98,98,220,0,0,218,220,0,0,218,98,220,0,0,0,0,218,220,0,0,0,0,258,259,260,0,0,218,220,0,0,218,98,220,740,740,740,
@ -1552,7 +1552,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(108,109):
{
static const int contents[] = {
static const short contents[] = {
12,12,12,12,13,23,23,23,23,23,23,14,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,21,7,7,9,7,7,7,20,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,21,28,28,0,28,28,28,20,13,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,14,12,12,12,12,12,12,12,
@ -1595,7 +1595,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(110,104):
{
static const int contents[] = {
static const short contents[] = {
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@ -1646,7 +1646,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(111,104):
{
static const int contents[] = {
static const short contents[] = {
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,13,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,14,12,12,
@ -1694,7 +1694,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53,48):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,178,179,179,179,179,180,178,180,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,0,258,259,259,259,259,260,218,220,0,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,
@ -1736,7 +1736,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53,49):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,220,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
259,259,259,259,259,259,259,100,98,220,0,0,0,0,218,98,98,220,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
219,219,219,219,219,219,219,218,98,220,0,0,0,0,218,98,98,220,0,0,0,0,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,
@ -1777,7 +1777,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53, 50):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1825,7 +1825,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1896,7 +1896,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53,52):
{
static const int contents[] = {
static const short contents[] = {
219,218,98,220,0,0,0,0,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,218,98,220,0,0,0,0,218,98,139,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
219,218,98,220,0,0,0,0,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
@ -1942,7 +1942,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(41,56):
{
static const int contents[] = {
static const short contents[] = {
259,259,259,259,259,259,259,259,259,260,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219,
0,0,0,0,0,0,0,0,0,0,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219,
179,179,179,179,179,179,180,178,180,0,218,98,220,0,218,98,98,220,0,218,98,98,98,220,0,218,98,98,98,98,220,0,218,98,220,219,219,219,219,219,
@ -1987,7 +1987,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(42,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,
219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,
219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,
@ -2035,7 +2035,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(43,56):
{
static const int contents[] = {
static const short contents[] = {
219,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
219,218,98,220,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,
219,218,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -2085,7 +2085,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(44,56):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -2135,7 +2135,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(45,56):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,219,219,219,219,219,
259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,218,98,220,219,219,219,219,219,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,218,98,220,219,219,219,219,219,
@ -2181,7 +2181,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(46,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
@ -2230,7 +2230,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(47,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,218,98,220,218,98,139,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,
219,219,219,218,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
219,219,219,218,98,220,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,
@ -2274,7 +2274,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(48,56):
{
static const int contents[] = {
static const short contents[] = {
179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,179,140,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,
259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,218,98,220,219,219,219,219,219,219,219,219,219,219,219,
@ -2316,7 +2316,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(49,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
@ -2363,7 +2363,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(50,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
@ -2409,7 +2409,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(51,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,98,220,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,98,220,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,98,220,218,98,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,
@ -2456,7 +2456,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(52,56):
{
static const int contents[] = {
static const short contents[] = {
219,218,98,220,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,218,98,220,219,
219,218,98,220,7,7,7,7,7,178,180,7,7,7,7,7,7,7,178,180,7,7,7,7,178,179,179,180,7,7,7,7,7,7,7,7,218,98,220,219,
219,218,98,220,0,0,0,0,0,218,220,0,0,0,0,0,0,0,218,220,0,0,0,0,218,98,98,220,0,0,0,0,0,0,0,0,218,98,220,219,
@ -2506,7 +2506,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(53,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,
@ -2550,7 +2550,7 @@ const int* finalclass::loadlevel(int rx, int ry)
case rn(54,56):
{
static const int contents[] = {
static const short contents[] = {
219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,
219,219,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,219,219,219,219,219,219,219,218,98,220,218,98,220,219,219,219,219,
@ -2601,7 +2601,7 @@ const int* finalclass::loadlevel(int rx, int ry)
default:
{
static const int contents[1200] = {0};
static const short contents[1200] = {0};
roomname = "Outer Space";
//game.test = true;

2
desktop_version/src/Finalclass.h
View file

@ -9,7 +9,7 @@
class finalclass
{
public:
const int* loadlevel(int rx, int ry);
const short* loadlevel(int rx, int ry);
std::string roomname;
bool warpx, warpy;

94
desktop_version/src/Labclass.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.h"
const int* labclass::loadlevel(int rx, int ry)
const short* labclass::loadlevel(int rx, int ry)
{
int t;
@ -20,7 +20,7 @@ const int* labclass::loadlevel(int rx, int ry)
}
t = rx + (ry * 100);
const int* result;
const short* result;
rcol = 0;
roomname = "Untitled room ["+help.String(rx) + "," + help.String(ry)+"]";
@ -31,7 +31,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,50):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,283,283,283,284,444,444,444,444,444,444,444,444,444,285,283,284,444,444,444,444,444,444,444,444,444,444,444,444,285,283,283,283,283,283,283,
@ -80,7 +80,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,51):
{
static const int contents[] = {
static const short contents[] = {
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,0,0,0,0,0,0,400,280,280,280,280,280,280,
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,402,0,0,0,0,0,0,400,280,280,280,280,280,280,
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,281,441,442,0,0,0,0,0,0,440,441,441,441,441,282,280,
@ -124,7 +124,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(49,51):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
@ -169,7 +169,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(49,52):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,0,0,0,406,286,286,286,286,
286,287,447,447,447,447,447,447,447,447,288,286,286,287,447,447,447,447,447,447,447,447,288,286,286,287,447,448,0,0,0,0,0,0,0,406,286,286,286,286,
286,408,68,68,68,68,68,68,68,68,406,286,286,408,68,68,68,68,68,68,68,68,406,286,286,408,68,68,0,0,0,0,0,0,0,406,286,286,286,286,
@ -217,7 +217,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(48,52):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,290,450,450,450,450,450,450,450,450,450,450,450,450,450,291,289,289,289,290,450,450,450,450,450,450,450,450,450,450,450,450,450,291,289,289,
289,289,289,289,289,411,70,70,70,70,70,70,70,70,70,70,70,70,70,409,289,289,289,411,70,70,70,70,70,70,70,70,70,70,70,70,70,409,289,289,
@ -265,7 +265,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(48,53):
{
static const int contents[] = {
static const short contents[] = {
295,417,0,0,0,0,0,0,0,0,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,417,0,0,0,0,0,0,0,0,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,417,0,0,0,0,0,0,0,0,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
@ -311,7 +311,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(49,53):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
@ -361,7 +361,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,53):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,411,0,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,411,0,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,411,0,0,0,0,0,449,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,291,289,289,289,289,289,289,289,
@ -406,7 +406,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,53):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,287,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -452,7 +452,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,53):
{
static const int contents[] = {
static const short contents[] = {
453,453,453,453,453,453,294,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
72,72,0,0,0,0,412,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
0,0,0,0,0,0,412,414,0,0,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
@ -496,7 +496,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,52):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,288,286,286,286,286,286,
68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,406,286,286,286,286,286,
@ -542,7 +542,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,52):
{
static const int contents[] = {
static const short contents[] = {
280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,280,281,441,441,441,441,441,441,441,441,441,441,
280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,280,280,280,280,280,280,280,280,280,281,442,64,64,64,64,64,64,64,64,64,64,
@ -591,7 +591,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,51):
{
static const int contents[] = {
static const short contents[] = {
292,292,293,453,453,453,453,453,453,453,453,453,453,453,453,453,453,294,292,292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,
292,293,454,72,72,72,72,72,72,72,72,72,72,72,72,72,72,452,294,292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,
292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,414,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,292,
@ -635,7 +635,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,50):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,284,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,
283,283,284,445,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,
283,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -681,7 +681,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,50):
{
static const int contents[] = {
static const short contents[] = {
447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,
68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -726,7 +726,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,51):
{
static const int contents[] = {
static const short contents[] = {
280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
280,280,280,280,280,280,280,280,402,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -769,7 +769,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(53,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,414,59,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,414,59,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,412,292,414,59,0,0,0,0,0,0,0,0,0,0,
@ -814,7 +814,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(53,50):
{
static const int contents[] = {
static const short contents[] = {
456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,
74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -858,7 +858,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(54,50):
{
static const int contents[] = {
static const short contents[] = {
444,444,444,444,444,444,444,444,444,285,283,283,283,284,444,444,444,444,444,444,444,444,444,444,444,444,285,283,283,283,284,444,444,444,444,444,444,444,444,444,
66,66,66,66,66,66,66,66,66,443,285,283,284,445,66,66,66,66,66,66,66,66,66,66,66,66,443,285,283,284,445,66,66,66,66,66,66,66,66,66,
0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,53,0,0,0,0,0,0,0,0,0,
@ -905,7 +905,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(54,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,56,406,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,56,406,286,408,55,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,56,406,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,56,406,286,408,55,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,56,406,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,56,446,399,448,55,0,0,0,0,0,0,0,0,0,
@ -951,7 +951,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(55,50):
{
static const int contents[] = {
static const short contents[] = {
450,450,450,450,291,289,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,289,
70,70,70,70,409,289,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,289,
0,0,0,0,409,289,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,409,289,
@ -995,7 +995,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(55,49):
{
static const int contents[] = {
static const short contents[] = {
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,296,456,456,456,456,456,456,456,456,456,456,297,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,417,0,0,0,0,0,0,0,0,0,62,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
@ -1047,7 +1047,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(55,51):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,402,0,0,0,0,0,0,400,280,280,280,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,402,0,0,0,0,0,0,400,280,280,280,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,400,402,0,0,0,0,0,0,400,280,280,280,
@ -1092,7 +1092,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(55,52):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,0,0,412,292,292,292,
@ -1137,7 +1137,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(55,53):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,283,283,283,283,283,283,284,444,444,444,444,444,444,444,445,53,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283,
283,283,283,283,283,283,283,283,284,445,66,66,66,66,66,66,66,66,0,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283,
283,283,283,283,283,283,283,283,405,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,403,283,405,0,0,0,0,0,0,403,283,283,283,
@ -1184,7 +1184,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(55,54):
{
static const int contents[] = {
static const short contents[] = {
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,61,0,0,0,0,0,0,0,62,415,295,417,0,0,0,0,0,0,415,295,295,295,
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,61,0,0,0,0,0,0,0,62,415,295,417,0,0,0,0,0,0,415,295,295,295,
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,61,0,0,0,0,0,0,0,62,415,295,417,0,0,0,0,0,0,415,295,295,295,
@ -1230,7 +1230,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(54,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,446,288,286,286,286,286,286,286,286,286,286,286,
@ -1276,7 +1276,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(53,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1328,7 +1328,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1377,7 +1377,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1426,7 +1426,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,54):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1476,7 +1476,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(49,54):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,408,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
286,286,286,286,287,448,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,310,352,368,0,0,0,0,0,0,0,
286,286,286,286,408,55,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,406,408,0,0,0,0,0,0,0,
@ -1524,7 +1524,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(49,55):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,292,414,59,0,0,0,0,0,0,60,427,59,0,0,0,0,0,0,60,427,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
292,292,292,292,414,59,0,0,0,0,0,0,60,427,59,0,0,0,0,0,0,60,427,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
292,292,292,292,414,59,0,0,0,0,0,0,60,427,59,0,0,0,0,0,0,60,427,59,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1569,7 +1569,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,55):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1616,7 +1616,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,55):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1670,7 +1670,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,55):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1718,7 +1718,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,56):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,57,0,0,0,0,0,58,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
@ -1760,7 +1760,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,57):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,56,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,408,55,0,0,0,0,0,56,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
286,286,286,286,286,286,287,447,447,447,288,286,286,286,286,286,408,55,0,0,0,0,0,56,406,286,286,286,286,286,287,447,447,447,288,286,286,286,286,286,
@ -1803,7 +1803,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,52):
{
static const int contents[] = {
static const short contents[] = {
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
281,441,441,441,441,282,281,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,282,280,280,
402,0,0,0,0,400,402,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,440,282,280,
@ -1853,7 +1853,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(53,55):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1896,7 +1896,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(54,55):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,295,295,295,295,295,295,295,295,417,412,292,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,295,295,295,295,295,295,295,295,417,412,292,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,295,295,295,295,295,295,296,456,457,412,292,
@ -1941,7 +1941,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(52,58):
{
static const int contents[] = {
static const short contents[] = {
295,295,295,295,295,417,0,415,295,295,295,295,295,295,295,295,295,417,0,0,0,0,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,295,295,295,295,417,0,415,295,295,295,295,295,295,295,295,295,417,0,0,0,0,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,295,295,295,295,417,0,415,295,295,295,295,295,295,295,295,295,417,0,0,0,0,0,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
@ -1985,7 +1985,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(51,58):
{
static const int contents[] = {
static const short contents[] = {
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
@ -2037,7 +2037,7 @@ const int* labclass::loadlevel(int rx, int ry)
case rn(50,58):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
@ -2087,7 +2087,7 @@ const int* labclass::loadlevel(int rx, int ry)
#endif
default:
{
static const int contents[1200] = {0};
static const short contents[1200] = {0};
result = contents;
break;
}

2
desktop_version/src/Labclass.h
View file

@ -9,7 +9,7 @@
class labclass
{
public:
const int* loadlevel(int rx, int ry);
const short* loadlevel(int rx, int ry);
std::string roomname;
int rcol;

14
desktop_version/src/Map.cpp
View file

@ -1324,7 +1324,7 @@ void mapclass::loadlevel(int rx, int ry)
{
tileset = 1;
extrarow = 1;
const int* tmap = otherlevel.loadlevel(rx, ry);
const short* tmap = otherlevel.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = otherlevel.roomname;
tileset = otherlevel.roomtileset;
@ -1342,7 +1342,7 @@ void mapclass::loadlevel(int rx, int ry)
}
case 2: //The Lab
{
const int* tmap = lablevel.loadlevel(rx, ry);
const short* tmap = lablevel.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = lablevel.roomname;
tileset = 1;
@ -1390,7 +1390,7 @@ void mapclass::loadlevel(int rx, int ry)
break;
case 4: //The Warpzone
{
const int* tmap = warplevel.loadlevel(rx, ry);
const short* tmap = warplevel.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = warplevel.roomname;
tileset = 1;
@ -1408,7 +1408,7 @@ void mapclass::loadlevel(int rx, int ry)
}
case 5: //Space station
{
const int* tmap = spacestation2.loadlevel(rx, ry);
const short* tmap = spacestation2.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = spacestation2.roomname;
tileset = 0;
@ -1416,7 +1416,7 @@ void mapclass::loadlevel(int rx, int ry)
}
case 6: //final level
{
const int* tmap = finallevel.loadlevel(finalx, finaly);
const short* tmap = finallevel.loadlevel(finalx, finaly);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = finallevel.roomname;
tileset = 1;
@ -1587,7 +1587,7 @@ void mapclass::loadlevel(int rx, int ry)
}
case 11: //Tower Hallways //Content is held in final level routine
{
const int* tmap = finallevel.loadlevel(rx, ry);
const short* tmap = finallevel.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));
roomname = finallevel.roomname;
tileset = 2;
@ -1687,7 +1687,7 @@ void mapclass::loadlevel(int rx, int ry)
roomname = room.roomname;
extrarow = 1;
const int* tmap = ed.loadlevel(rx, ry);
const short* tmap = ed.loadlevel(rx, ry);
SDL_memcpy(contents, tmap, sizeof(contents));

2
desktop_version/src/Map.h
View file

@ -88,7 +88,7 @@ public:
int roomdeaths[20 * 20];
int roomdeathsfinal[20 * 20];
static const int areamap[20 * 20];
int contents[40 * 30];
short contents[40 * 30];
bool explored[20 * 20];
int vmult[30];

454
desktop_version/src/Otherlevel.cpp
View file

File diff suppressed because it is too large Load diff

2
desktop_version/src/Otherlevel.h
View file

@ -9,7 +9,7 @@
class otherlevelclass
{
public:
const int* loadlevel(int rx, int ry);
const short* loadlevel(int rx, int ry);
std::string roomname;

152
desktop_version/src/Spacestation2.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.h"
const int* spacestation2class::loadlevel(int rx, int ry)
const short* spacestation2class::loadlevel(int rx, int ry)
{
int t;
rx -= 100;
@ -13,7 +13,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
t = rx + (ry * 100);
const int* result;
const short* result;
roomname = "Untitled room ["+help.String(rx) + "," + help.String(ry)+"]";
switch(t)
@ -22,7 +22,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,50):
{
static const int contents[] = {
static const short contents[] = {
492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
@ -70,7 +70,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(49,50):
{
static const int contents[] = {
static const short contents[] = {
295,295,295,295,295,295,417,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,295,295,295,295,295,417,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
295,295,295,295,295,295,417,698,698,698,698,415,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,
@ -111,7 +111,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(49,49):
{
static const int contents[] = {
static const short contents[] = {
107,107,107,107,107,107,229,689,689,689,689,227,107,107,229,689,689,689,689,689,227,107,107,107,107,107,107,107,107,107,107,108,268,268,268,268,268,268,268,268,
107,107,107,107,107,107,229,689,689,689,689,227,107,107,229,689,689,689,689,689,227,107,107,107,107,107,107,107,107,107,107,229,0,0,0,0,0,0,0,0,
107,107,107,107,107,107,229,850,850,691,689,227,107,107,229,689,689,689,689,689,227,107,107,107,107,107,107,107,107,107,107,229,689,811,0,0,0,0,0,0,
@ -161,7 +161,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(49,48):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,411,0,0,800,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,
289,289,289,289,289,289,411,0,0,800,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,
289,289,289,289,289,289,411,0,0,800,680,409,289,289,411,680,680,680,680,680,409,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,
@ -204,7 +204,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(49,47):
{
static const int contents[] = {
static const short contents[] = {
92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,
92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,93,253,253,253,253,253,
92,92,92,92,92,92,93,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,254,9,9,9,9,9,
@ -264,7 +264,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,47):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,
259,259,259,259,259,259,259,259,259,259,259,259,100,98,98,98,98,98,98,98,98,98,98,98,98,98,98,99,259,259,259,259,259,259,259,259,100,98,98,98,
9,9,9,9,9,9,9,9,9,9,9,9,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,7,7,7,7,7,7,7,7,218,98,98,98,
@ -322,7 +322,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,48):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,
292,292,292,414,0,0,0,0,412,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,414,0,0,0,0,412,292,292,292,
292,292,292,414,0,0,0,0,452,453,453,453,453,453,294,292,292,292,292,292,292,292,292,292,292,293,453,453,453,453,453,454,0,0,0,0,412,292,292,292,
@ -371,7 +371,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,49):
{
static const int contents[] = {
static const short contents[] = {
274,274,274,274,274,274,274,274,274,274,274,274,115,113,113,113,113,113,113,113,113,113,113,113,113,113,113,114,274,274,274,274,274,274,274,274,274,274,274,274,
0,0,0,0,0,0,0,0,0,0,0,0,273,115,113,113,113,113,113,113,113,113,113,113,113,113,114,275,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,9,233,113,113,113,113,113,113,113,113,113,113,113,113,235,9,0,0,0,0,0,0,0,0,0,0,0,0,
@ -419,7 +419,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,49):
{
static const int contents[] = {
static const short contents[] = {
244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,85,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,243,244,244,244,244,244,244,244,244,244,244,244,244,244,244,244,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,800,680,680,680,680,680,7,7,7,7,7,7,7,7,7,7,7,1125,9,9,9,9,
@ -474,7 +474,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,49):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
@ -530,7 +530,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,49):
{
static const int contents[] = {
static const short contents[] = {
107,107,107,107,107,107,107,107,229,0,0,0,0,809,689,689,227,107,107,107,107,107,107,229,689,689,811,0,0,0,0,227,107,107,107,107,107,107,107,107,
268,268,268,268,268,268,268,268,269,0,0,0,0,809,689,689,227,107,107,107,107,107,107,229,689,689,811,0,0,0,0,267,268,268,268,268,268,268,268,268,
9,9,9,9,9,9,9,9,9,0,0,0,0,809,689,689,227,107,107,107,107,107,107,229,689,689,811,0,0,0,0,9,9,9,9,9,9,9,9,9,
@ -581,7 +581,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,49):
{
static const int contents[] = {
static const short contents[] = {
92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,0,0,0,0,0,212,92,92,92,
253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,254,0,0,0,0,0,0,0,0,212,92,92,92,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,0,0,0,0,0,0,0,0,212,92,92,92,
@ -632,7 +632,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,48):
{
static const int contents[] = {
static const short contents[] = {
483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
644,644,644,644,644,644,644,644,644,644,644,644,485,483,483,484,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,485,483,483,483,
0,0,0,0,0,0,0,0,0,0,0,0,643,644,644,645,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,603,483,483,483,
@ -683,7 +683,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,48):
{
static const int contents[] = {
static const short contents[] = {
510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
671,671,671,671,671,671,671,671,671,671,512,511,671,671,671,671,671,671,671,671,671,671,671,671,671,671,512,511,671,671,671,671,671,671,671,671,671,671,671,671,
9,9,9,9,9,9,9,9,9,9,630,632,9,9,9,9,9,9,9,9,9,9,9,9,9,9,630,632,9,9,9,9,0,0,0,0,0,0,0,0,
@ -738,7 +738,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,48):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
450,450,450,450,291,289,289,289,290,450,450,450,450,450,450,450,450,450,291,289,289,290,450,450,450,450,450,450,450,450,450,291,289,289,289,290,450,450,450,450,
9,9,9,9,409,289,289,289,411,7,7,7,7,7,7,7,7,7,409,289,289,411,7,7,7,7,7,7,7,7,7,409,289,289,289,411,9,9,9,9,
@ -791,7 +791,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,48):
{
static const int contents[] = {
static const short contents[] = {
313,313,313,313,313,313,313,435,0,0,0,0,433,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,313,
313,313,313,313,313,313,313,435,0,0,0,0,433,313,313,313,313,313,313,313,313,313,313,313,313,313,313,314,474,474,474,474,474,474,474,474,474,474,474,474,
313,313,313,313,313,313,313,435,770,770,771,0,433,313,313,313,313,313,313,313,313,313,313,313,313,313,313,435,9,9,9,9,9,9,9,9,9,9,9,9,
@ -847,7 +847,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,47):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,405,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
@ -900,7 +900,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,47):
{
static const int contents[] = {
static const short contents[] = {
310,311,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,312,310,310,310,310,310,310,432,0,0,0,0,430,432,0,0,0,0,0,0,
310,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,430,310,310,310,310,310,310,432,0,0,0,0,430,432,0,0,0,0,0,0,
310,432,0,0,0,0,0,0,772,773,773,773,773,773,773,773,773,773,773,773,430,310,310,310,310,310,310,432,0,0,0,0,430,432,0,0,0,0,0,0,
@ -951,7 +951,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,46):
{
static const int contents[] = {
static const short contents[] = {
110,110,110,110,110,110,232,686,686,686,686,686,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,
110,110,110,110,111,271,272,686,686,686,686,686,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,
110,110,110,110,232,686,686,686,686,686,686,686,230,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,
@ -998,7 +998,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,45):
{
static const int contents[] = {
static const short contents[] = {
92,92,92,92,92,92,214,683,683,683,683,683,252,253,94,92,92,92,92,92,214,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,
92,92,92,92,92,92,214,683,683,683,683,683,683,683,212,92,92,92,92,92,214,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,
92,92,92,92,92,92,214,683,683,683,683,683,683,683,212,92,92,92,92,92,214,0,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,92,
@ -1048,7 +1048,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,44):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,293,453,453,453,453,453,453,453,294,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,293,454,0,0,0,0,0,0,0,412,292,292,
@ -1104,7 +1104,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,45):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,408,0,0,0,0,0,806,686,686,686,686,686,686,686,686,686,808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
286,286,286,286,408,0,0,0,0,0,806,686,686,686,686,686,686,686,686,686,808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
286,286,286,286,408,0,0,0,0,0,806,686,686,686,686,686,686,686,686,686,808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1144,7 +1144,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,44):
{
static const int contents[] = {
static const short contents[] = {
98,98,98,98,220,0,0,0,0,0,800,680,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,218,98,98,98,98,
98,98,98,98,220,0,0,0,0,0,800,680,258,259,259,259,259,259,259,259,259,259,259,259,259,259,259,259,260,0,0,0,0,0,0,218,98,98,98,98,
98,98,98,98,220,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,802,0,0,0,0,0,0,0,218,98,99,259,259,
@ -1192,7 +1192,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,45):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1234,7 +1234,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,47):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1282,7 +1282,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,46):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,411,0,0,0,0,409,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,290,450,451,0,0,0,0,449,450,291,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,451,0,0,0,0,0,0,0,0,449,450,450,450,450,450,450,450,450,450,450,450,450,450,450,450,
@ -1324,7 +1324,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,46):
{
static const int contents[] = {
static const short contents[] = {
107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
107,107,108,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,268,
@ -1371,7 +1371,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,44):
{
static const int contents[] = {
static const short contents[] = {
89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,0,0,0,0,0,0,0,0,0,0,209,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,0,0,0,0,0,0,0,0,0,0,209,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
250,250,250,250,250,250,250,250,250,250,250,250,91,89,211,0,0,0,0,0,0,0,0,0,0,209,89,90,250,250,250,250,250,250,250,250,250,250,250,250,
@ -1412,7 +1412,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,45):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,433,313,435,0,0,809,689,473,474,474,474,474,474,474,315,313,313,313,313,313,313,313,313,313,435,689,689,811,0,0,433,313,313,313,313,
0,0,0,0,0,433,313,435,0,0,809,689,689,689,689,689,689,689,689,433,313,313,313,313,313,313,313,313,313,435,689,689,811,0,0,433,313,313,313,313,
0,0,0,0,0,433,313,435,0,0,809,689,689,689,689,689,689,689,689,473,474,474,474,474,474,474,474,315,313,435,689,689,811,0,0,433,313,313,313,313,
@ -1474,7 +1474,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,44):
{
static const int contents[] = {
static const short contents[] = {
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,87,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
247,247,247,247,247,88,86,86,86,86,86,86,86,86,86,86,86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1528,7 +1528,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,47):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1588,7 +1588,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,46):
{
static const int contents[] = {
static const short contents[] = {
495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
656,656,656,656,656,656,656,656,656,656,656,497,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
@ -1633,7 +1633,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(55,47):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,815,695,695,695,695,695,695,695,209,89,211,695,695,695,695,695,695,695,817,0,0,0,0,0,209,89,89,89,89,89,89,89,89,
0,0,0,0,0,0,0,815,695,695,695,695,695,695,695,209,89,211,695,695,695,695,695,695,695,817,0,0,0,0,0,209,89,89,89,89,89,89,89,89,
0,0,0,0,0,0,0,815,695,695,695,695,695,695,695,209,89,211,695,695,695,695,695,695,695,817,0,0,0,0,0,209,89,89,89,89,89,89,89,89,
@ -1687,7 +1687,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(55,46):
{
static const int contents[] = {
static const short contents[] = {
504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,626,683,683,683,683,624,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,
504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,626,683,683,683,683,664,506,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,
504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,626,683,683,683,683,683,624,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,504,
@ -1729,7 +1729,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(55,45):
{
static const int contents[] = {
static const short contents[] = {
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,618,498,
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,499,659,659,659,659,659,500,498,499,659,659,659,659,659,500,498,498,620,0,0,0,0,618,498,
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,620,0,0,0,0,0,618,498,620,0,0,0,0,0,618,498,498,620,0,0,0,0,618,498,
@ -1775,7 +1775,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(55,44):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,447,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1848,7 +1848,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,44):
{
static const int contents[] = {
static const short contents[] = {
298,298,298,298,298,298,298,420,0,0,0,0,418,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
459,459,459,459,459,459,459,460,0,0,0,0,418,298,298,298,298,298,298,298,298,299,459,459,459,459,300,298,298,298,298,298,298,298,298,298,298,298,298,298,
0,0,0,0,0,0,0,0,0,0,0,0,418,298,298,298,298,298,298,298,298,420,9,9,9,9,418,298,298,298,298,298,298,298,298,298,298,298,298,298,
@ -1898,7 +1898,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,45):
{
static const int contents[] = {
static const short contents[] = {
614,49,0,0,0,0,50,612,614,0,0,0,0,0,0,0,0,0,0,0,50,612,492,492,492,492,614,49,0,0,0,0,0,0,0,0,0,0,612,492,
614,49,0,0,0,0,50,612,614,0,0,0,0,0,0,0,0,0,0,0,50,612,492,492,492,492,614,49,0,0,0,0,0,0,0,0,0,0,612,492,
614,49,0,0,0,0,50,612,614,0,0,0,0,0,0,0,0,0,0,0,50,612,492,492,492,492,614,49,0,0,0,0,0,0,0,0,0,0,612,492,
@ -1939,7 +1939,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,46):
{
static const int contents[] = {
static const short contents[] = {
208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,86,86,86,86,87,248,49,0,0,0,0,0,0,0,0,50,206,86,86,86,86,86,86,
208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,86,86,86,87,248,9,0,0,0,0,0,0,0,0,0,50,206,86,86,86,86,86,86,
208,49,0,0,0,0,50,206,86,86,86,86,86,86,86,86,86,86,86,87,248,9,0,0,0,0,0,0,0,0,0,0,50,206,86,86,86,86,86,86,
@ -1980,7 +1980,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,47):
{
static const int contents[] = {
static const short contents[] = {
217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,0,0,0,0,50,215,95,95,217,0,0,0,0,215,95,95,95,95,95,95,95,95,
217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,0,0,0,0,50,215,95,95,217,0,0,0,0,215,95,95,95,95,95,95,95,95,
217,49,0,0,0,0,50,215,95,95,95,95,95,95,95,95,95,217,0,0,0,0,50,215,95,95,217,0,0,0,0,215,95,95,95,95,95,95,95,95,
@ -2021,7 +2021,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,48):
{
static const int contents[] = {
static const short contents[] = {
432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,432,49,0,0,0,0,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,432,49,0,0,0,0,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
432,49,0,0,0,0,50,430,310,310,310,310,310,310,310,310,310,432,49,0,0,0,0,470,312,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
@ -2062,7 +2062,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,49):
{
static const int contents[] = {
static const short contents[] = {
220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,50,218,98,98,
220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,50,218,98,98,
220,49,0,0,0,0,50,218,98,98,98,98,98,98,98,98,98,98,98,98,98,98,99,259,259,259,259,259,259,259,259,260,0,0,0,0,50,218,98,98,
@ -2103,7 +2103,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,50):
{
static const int contents[] = {
static const short contents[] = {
211,49,0,0,0,0,50,209,89,89,89,89,89,89,89,89,211,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,209,89,89,89,89,89,89,89,
211,49,0,0,0,0,50,209,89,89,89,89,89,89,89,89,211,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,209,89,89,89,89,89,89,89,
211,49,0,0,0,0,50,209,89,89,89,89,89,89,89,89,211,49,0,0,0,0,0,0,0,0,0,0,0,0,0,50,209,89,89,89,89,89,89,89,
@ -2151,7 +2151,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,43):
{
static const int contents[] = {
static const short contents[] = {
495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,0,0,0,0,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,617,761,761,761,761,615,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
@ -2200,7 +2200,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(56,43):
{
static const int contents[] = {
static const short contents[] = {
301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,
301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,
462,462,462,462,303,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,
@ -2267,7 +2267,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(55,43):
{
static const int contents[] = {
static const short contents[] = {
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
247,247,247,88,86,86,86,87,247,247,247,247,247,247,247,88,86,86,86,86,86,86,86,86,87,247,247,247,247,247,247,247,88,86,86,86,87,247,247,247,
@ -2318,7 +2318,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,43):
{
static const int contents[] = {
static const short contents[] = {
507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,629,0,0,0,0,0,0,627,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,
507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,629,0,0,0,0,0,0,627,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,
507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,629,0,0,0,0,0,0,667,668,509,507,507,507,507,508,668,668,668,668,668,668,668,668,668,668,
@ -2367,7 +2367,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,43):
{
static const int contents[] = {
static const short contents[] = {
310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,812,692,692,692,692,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,432,0,0,812,692,692,692,692,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,472,0,0,812,692,692,692,692,692,430,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
@ -2410,7 +2410,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,43):
{
static const int contents[] = {
static const short contents[] = {
89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,
@ -2453,7 +2453,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,43):
{
static const int contents[] = {
static const short contents[] = {
286,286,286,286,286,408,689,689,811,0,0,0,406,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
286,286,286,286,286,408,689,689,811,0,0,0,406,287,447,447,447,447,288,286,286,286,286,286,286,287,447,447,447,447,288,286,286,286,286,286,286,286,286,286,
286,286,286,286,286,408,689,689,811,0,0,0,446,448,9,9,9,9,446,447,447,447,447,447,447,448,9,9,9,9,446,447,447,447,447,447,447,447,447,447,
@ -2503,7 +2503,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
{
//No const here...
static int contents[] = {
static short contents[] = {
492,614,680,680,680,680,652,653,653,653,653,653,653,653,653,653,653,653,653,653,653,653,653,653,653,653,653,654,680,680,802,0,0,0,612,492,492,492,492,492,
492,614,680,680,680,680,680,802,0,0,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,680,680,680,680,680,802,0,0,0,612,492,492,492,492,492,
492,614,680,680,680,680,680,802,0,0,0,0,0,0,0,800,680,680,680,680,680,680,680,680,680,680,680,680,680,680,802,0,0,0,612,492,492,492,492,492,
@ -2566,7 +2566,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(48,43):
{
static const int contents[] = {
static const short contents[] = {
89,89,211,695,695,695,695,209,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
89,89,211,695,695,695,695,209,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
89,89,211,695,695,695,695,249,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,91,89,89,
@ -2617,7 +2617,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(48,42):
{
static const int contents[] = {
static const short contents[] = {
310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,310,
310,310,310,310,310,310,310,310,311,471,471,471,471,471,471,312,310,310,310,310,311,471,471,471,471,471,471,312,310,310,310,310,310,310,310,310,310,310,310,310,
310,310,310,310,310,310,310,310,432,9,9,9,9,9,9,430,310,310,310,310,432,9,9,9,9,9,9,430,310,310,310,310,311,471,471,471,471,471,471,471,
@ -2666,7 +2666,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(49,42):
{
static const int contents[] = {
static const short contents[] = {
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,0,0,0,818,698,698,415,295,295,295,295,295,
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,417,0,0,0,818,698,698,415,295,295,295,295,295,
456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,297,295,295,295,295,295,417,0,0,0,818,698,698,415,295,295,295,295,295,
@ -2711,7 +2711,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(49,41):
{
static const int contents[] = {
static const short contents[] = {
489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,
489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,
489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,
@ -2762,7 +2762,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(48,41):
{
static const int contents[] = {
static const short contents[] = {
298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
@ -2809,7 +2809,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,42):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,
@ -2853,7 +2853,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(54,42):
{
static const int contents[] = {
static const short contents[] = {
92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,
92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,92,93,253,253,253,253,253,253,253,94,92,92,92,92,92,92,92,92,92,92,92,
253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,254,9,9,9,9,9,9,9,212,92,92,92,92,92,92,92,92,92,92,92,
@ -2921,7 +2921,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,42):
{
static const int contents[] = {
static const short contents[] = {
95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,
95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,
95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,96,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
@ -2964,7 +2964,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,42):
{
static const int contents[] = {
static const short contents[] = {
495,495,495,495,495,617,680,680,680,680,680,680,615,495,496,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,497,495,495,495,495,
495,495,495,495,495,617,680,680,680,680,680,680,615,495,617,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,615,495,495,495,495,
495,495,495,495,495,617,680,680,680,680,680,680,615,495,617,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,615,495,495,495,495,
@ -3011,7 +3011,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,42):
{
static const int contents[] = {
static const short contents[] = {
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
86,86,86,86,86,86,86,87,247,247,247,247,247,247,247,247,247,88,87,247,247,247,247,247,247,247,88,87,247,247,247,247,247,247,247,247,247,88,86,86,
@ -3064,7 +3064,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,41):
{
static const int contents[] = {
static const short contents[] = {
92,92,92,92,92,214,0,0,0,0,0,0,212,92,93,253,253,253,94,92,92,92,92,92,92,92,92,92,92,92,92,92,93,253,253,253,94,92,92,92,
92,92,92,92,92,214,0,0,0,0,0,0,212,92,214,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,212,92,92,92,
92,92,92,92,92,214,0,0,0,0,0,0,212,92,214,0,0,0,212,92,92,92,92,92,92,92,92,92,92,92,92,92,214,0,0,0,212,92,92,92,
@ -3114,7 +3114,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,40):
{
static const int contents[] = {
static const short contents[] = {
283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
283,283,283,283,283,405,0,0,0,0,0,0,403,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
@ -3163,7 +3163,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,40):
{
static const int contents[] = {
static const short contents[] = {
495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
495,495,495,495,495,495,495,496,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,497,495,495,495,495,
495,495,495,495,495,495,495,617,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,680,615,495,495,495,495,
@ -3217,7 +3217,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(50,39):
{
static const int contents[] = {
static const short contents[] = {
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,
292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,292,293,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,453,294,
@ -3261,7 +3261,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,39):
{
static const int contents[] = {
static const short contents[] = {
95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,
95,95,96,256,256,256,256,256,256,256,256,256,97,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,
95,95,217,0,0,0,0,0,0,0,0,0,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,
@ -3309,7 +3309,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,39):
{
static const int contents[] = {
static const short contents[] = {
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
289,289,289,289,289,289,289,289,289,290,450,450,450,450,450,450,450,450,450,450,450,450,450,291,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,289,
@ -3352,7 +3352,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,39):
{
static const int contents[] = {
static const short contents[] = {
483,483,483,483,483,483,483,483,483,483,483,483,483,483,484,644,644,644,644,485,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,695,695,695,695,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
483,483,483,483,483,483,483,483,483,483,483,483,483,483,605,695,695,695,695,603,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
@ -3399,7 +3399,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,40):
{
static const int contents[] = {
static const short contents[] = {
310,310,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,430,310,310,
310,310,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,430,310,310,
310,310,432,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,430,310,310,
@ -3439,7 +3439,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(53,41):
{
static const int contents[] = {
static const short contents[] = {
286,286,408,686,686,686,686,686,686,808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,806,686,686,686,686,686,686,686,686,686,406,286,286,
286,286,408,686,686,686,686,686,686,808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,806,686,686,686,686,686,686,686,686,686,406,286,286,
286,286,408,686,686,686,686,686,686,808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,806,686,686,686,686,686,686,686,686,686,406,286,286,
@ -3487,7 +3487,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,41):
{
static const int contents[] = {
static const short contents[] = {
83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,
83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,
83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,
@ -3534,7 +3534,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(51,41):
{
static const int contents[] = {
static const short contents[] = {
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
87,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,88,86,86,86,86,86,86,86,86,86,86,86,86,86,
@ -3575,7 +3575,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
case rn(52,40):
{
static const int contents[] = {
static const short contents[] = {
89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,0,0,0,0,209,89,89,89,89,89,89,89,89,89,
89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,0,0,0,0,209,89,89,89,89,89,89,89,89,89,
89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,0,0,0,0,209,89,89,89,89,89,89,89,89,89,
@ -3621,7 +3621,7 @@ const int* spacestation2class::loadlevel(int rx, int ry)
default:
{
static const int contents[1200] = {0};
static const short contents[1200] = {0};
roomname = "Outer Space";
obj.fatal_bottom();
result = contents;

2
desktop_version/src/Spacestation2.h
View file

@ -9,7 +9,7 @@
class spacestation2class
{
public:
const int* loadlevel(int rx, int ry);
const short* loadlevel(int rx, int ry);
std::string roomname;
};

14
desktop_version/src/Tower.cpp
View file

@ -96,7 +96,7 @@ void towerclass::loadminitower1()
{
//Loads the first minitower into the array.
#if !defined(MAKEANDPLAY)
static const int tmap[] = {
static const short tmap[] = {
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@ -199,7 +199,7 @@ void towerclass::loadminitower1()
12,12,12,12,12,12,12,12,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12,
};
#else
static const int tmap[100*40] = {0};
static const short tmap[100*40] = {0};
#endif
SDL_memcpy(minitower, tmap, sizeof(minitower));
@ -208,7 +208,7 @@ void towerclass::loadminitower1()
void towerclass::loadminitower2()
{
#if !defined(MAKEANDPLAY)
static const int tmap[] = {
static const short tmap[] = {
12,12,21,10,0,0,0,0,0,0,0,0,0,0,0,0,11,20,21,10,0,20,21,28,28,20,21,28,28,20,12,12,12,12,12,12,12,12,12,12,
12,12,21,10,0,0,0,0,0,0,0,0,0,0,0,0,11,20,21,10,0,20,21,28,28,20,21,28,28,20,12,12,12,12,12,12,12,12,12,12,
12,12,21,10,0,0,0,0,0,0,0,0,0,0,0,0,11,20,21,10,0,20,21,28,28,20,21,28,28,20,12,12,12,12,12,12,12,12,12,12,
@ -311,7 +311,7 @@ void towerclass::loadminitower2()
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,21,28,28,0,0,0,0,0,0,0,0,0,20,12,12,12,12,12,
};
#else
static const int tmap[100*40] = {0};
static const short tmap[100*40] = {0};
#endif
SDL_memcpy(minitower, tmap, sizeof(minitower));
@ -321,7 +321,7 @@ void towerclass::loadminitower2()
void towerclass::loadbackground()
{
//Loads the background into the array.
static const int tmap[] = {
static const short tmap[] = {
1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,1,2,0,0,0,0,0,0,0,0,0,0,0,0,5,4,0,0,
2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,1,2,0,0,0,0,0,0,0,0,0,0,0,0,5,1,1,4,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,1,2,0,0,0,0,0,0,0,0,0,0,0,0,5,1,1,1,1,4,
@ -450,7 +450,7 @@ void towerclass::loadmap()
{
//Loads the map into the array.
#if !defined(MAKEANDPLAY)
static const int tmap[] = {
static const short tmap[] = {
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
@ -1153,7 +1153,7 @@ void towerclass::loadmap()
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
};
#else
static const int tmap[700*40] = {0};
static const short tmap[700*40] = {0};
#endif
SDL_memcpy(contents, tmap, sizeof(contents));

6
desktop_version/src/Tower.h
View file

@ -20,9 +20,9 @@ public:
void loadmap();
int back[40 * 120];
int contents[40 * 700];
int minitower[40 * 100];
short back[40 * 120];
short contents[40 * 700];
short minitower[40 * 100];
int vmult[40 * 700];
bool minitowermode;

52
desktop_version/src/WarpClass.cpp
View file

@ -2,7 +2,7 @@
#include "MakeAndPlay.h"
const int* warpclass::loadlevel(int rx, int ry)
const short* warpclass::loadlevel(int rx, int ry)
{
int t;
@ -12,7 +12,7 @@ const int* warpclass::loadlevel(int rx, int ry)
ry += 49; //warp
t = rx + (ry * 100);
const int* result;
const short* result;
rcol = 0;
warpx = false;
warpy = false;
@ -24,7 +24,7 @@ const int* warpclass::loadlevel(int rx, int ry)
#if !defined(MAKEANDPLAY)
case rn(50,50):
{
static const int contents[] = {
static const short contents[] = {
120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120,
120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120,
120,120,120,120,120,120,120,120,120,120,120,120,120,200,80,202,0,0,0,0,0,0,0,0,200,80,202,120,120,120,120,120,120,120,120,120,120,120,120,120,
@ -74,7 +74,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(51,50):
{
static const int contents[] = {
static const short contents[] = {
247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,248,206,86,208,246,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,247,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -117,7 +117,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(51,51):
{
static const int contents[] = {
static const short contents[] = {
83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,
83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,
244,244,244,244,244,245,0,0,0,0,243,244,244,244,244,244,244,245,0,0,0,0,243,244,244,244,244,244,244,245,0,0,0,0,243,244,244,244,244,244,
@ -163,7 +163,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(52,51):
{
static const int contents[] = {
static const short contents[] = {
95,95,95,95,95,217,0,0,0,0,215,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,95,
256,256,256,256,256,257,0,0,0,0,255,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -211,7 +211,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(52,50):
{
static const int contents[] = {
static const short contents[] = {
213,212,92,214,172,174,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92,
213,212,92,214,252,254,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92,
213,212,92,214,0,0,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,214,0,0,0,0,0,0,212,92,92,92,
@ -256,7 +256,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(53,50):
{
static const int contents[] = {
static const short contents[] = {
250,250,250,250,250,250,251,0,0,0,209,211,249,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,
0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,209,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -300,7 +300,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(53,49):
{
static const int contents[] = {
static const short contents[] = {
126,126,126,126,206,86,208,0,0,0,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,
126,126,126,126,206,86,208,0,0,0,246,247,248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,246,247,
126,126,126,126,206,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -344,7 +344,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(54,49):
{
static const int contents[] = {
static const short contents[] = {
80,80,80,202,200,202,200,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,200,202,200,80,
241,241,241,242,200,202,240,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,241,242,200,202,240,241,
0,0,0,0,200,202,7,7,7,7,7,7,160,161,161,162,7,7,7,7,7,7,7,160,161,161,162,7,7,7,7,7,7,7,7,7,200,202,0,0,
@ -392,7 +392,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(54,50):
{
static const int contents[] = {
static const short contents[] = {
86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86,
86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86,
86,86,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,86,86,
@ -438,7 +438,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(55,50):
{
static const int contents[] = {
static const short contents[] = {
212,92,92,214,252,253,253,254,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,
212,92,92,214,0,0,0,0,252,253,253,254,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,
212,92,92,214,0,0,0,0,0,0,0,0,252,253,253,254,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,212,92,92,214,
@ -485,7 +485,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(55,51):
{
static const int contents[] = {
static const short contents[] = {
83,83,83,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,
244,244,244,245,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,243,245,0,0,0,0,243,245,0,0,0,0,203,83,
0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,83,
@ -534,7 +534,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(54,51):
{
static const int contents[] = {
static const short contents[] = {
89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,211,209,89,89,211,209,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,89,
250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,251,249,250,250,251,249,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,250,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -586,7 +586,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(54,52):
{
static const int contents[] = {
static const short contents[] = {
95,95,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,177,0,0,0,0,215,95,95,95,
256,256,256,257,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,257,0,0,0,0,255,256,256,256,
176,177,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,175,176,
@ -641,7 +641,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(53,52):
{
static const int contents[] = {
static const short contents[] = {
207,207,207,207,207,207,207,207,207,207,207,207,207,206,86,208,206,208,0,0,0,0,206,208,206,86,208,207,207,207,207,206,86,208,246,247,247,248,206,86,
207,207,207,207,207,207,207,207,207,207,207,207,207,206,86,208,206,208,0,0,0,0,206,208,206,86,208,207,207,207,207,206,86,208,0,0,0,0,206,86,
167,167,167,167,167,167,167,167,167,167,167,167,167,128,86,208,206,208,0,0,0,0,206,208,206,86,127,167,167,167,167,128,86,208,0,0,0,0,206,86,
@ -696,7 +696,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(53,51):
{
static const int contents[] = {
static const short contents[] = {
83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83,
83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83,
83,83,205,0,0,0,0,203,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,205,0,0,0,0,203,205,0,0,0,0,203,83,83,
@ -741,7 +741,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(55,49):
{
static const int contents[] = {
static const short contents[] = {
0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0,
0,0,212,92,214,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,92,214,0,0,
0,0,252,253,254,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252,253,254,0,0,
@ -787,7 +787,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(55,52):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -833,7 +833,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(52,52):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,215,95,217,216,216,216,216,215,95,217,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -879,7 +879,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(50,51):
{
static const int contents[] = {
static const short contents[] = {
83,83,83,83,83,83,83,83,83,83,83,83,83,205,203,83,83,83,83,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,83,83,83,
83,83,83,83,83,83,83,83,83,83,83,83,83,205,203,83,83,83,83,83,83,83,83,83,83,205,0,0,0,0,203,83,83,83,83,83,83,83,83,83,
83,83,83,83,83,83,83,83,83,83,83,83,83,205,243,244,244,244,244,244,244,244,244,244,244,245,0,0,0,0,203,83,83,83,83,83,83,83,83,83,
@ -929,7 +929,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(52,49):
{
static const int contents[] = {
static const short contents[] = {
86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86,
86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86,
86,86,86,86,86,208,0,0,0,0,206,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,206,208,0,0,0,0,206,86,86,86,86,86,
@ -980,7 +980,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(50,49):
{
static const int contents[] = {
static const short contents[] = {
83,83,205,0,0,0,0,0,203,83,83,83,83,83,83,83,83,205,203,83,83,83,205,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,203,83,
83,83,205,0,0,0,0,0,243,244,244,244,244,244,244,244,244,245,203,83,83,83,205,0,0,0,0,0,243,244,244,244,245,0,0,0,0,0,203,83,
83,83,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,83,83,83,205,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,203,83,
@ -1023,7 +1023,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(51,49):
{
static const int contents[] = {
static const short contents[] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@ -1074,7 +1074,7 @@ const int* warpclass::loadlevel(int rx, int ry)
case rn(49,49):
{
static const int contents[] = {
static const short contents[] = {
80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201,
80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201,
80,80,80,80,80,80,80,80,80,80,80,80,80,80,80,202,0,0,0,0,0,0,0,200,80,202,201,201,201,201,201,201,201,201,201,201,201,201,201,201,
@ -1126,7 +1126,7 @@ const int* warpclass::loadlevel(int rx, int ry)
default:
{
static const int contents[1200] = {0};
static const short contents[1200] = {0};
//roomname = "Outer Space";
result = contents;
break;

2
desktop_version/src/WarpClass.h
View file

@ -9,7 +9,7 @@
class warpclass
{
public:
const int* loadlevel(int rx, int ry);
const short* loadlevel(int rx, int ry);
std::string roomname;
int rcol;
bool warpx, warpy;

4
desktop_version/src/editor.cpp
View file

@ -512,7 +512,7 @@ void editorclass::getlin(const enum textmode mode, const std::string& prompt, st
ed.oldenttext = key.keybuffer;
}
const int* editorclass::loadlevel( int rxi, int ryi )
const short* editorclass::loadlevel( int rxi, int ryi )
{
//Set up our buffer array to be picked up by mapclass
rxi -= 100;
@ -522,7 +522,7 @@ const int* editorclass::loadlevel( int rxi, int ryi )
if(rxi>=mapwidth)rxi-=mapwidth;
if(ryi>=mapheight)ryi-=mapheight;
static int result[1200];
static short result[1200];
for (int j = 0; j < 30; j++)
{

4
desktop_version/src/editor.h
View file

@ -130,7 +130,7 @@ class editorclass{
void reset();
void getlin(const enum textmode mode, const std::string& prompt, std::string* ptr);
const int* loadlevel(int rxi, int ryi);
const short* loadlevel(int rxi, int ryi);
void placetile(int x, int y, int t);
@ -190,7 +190,7 @@ class editorclass{
std::vector<std::string> getLevelDirFileNames( );
static const int maxwidth = 20, maxheight = 20; //Special; the physical max the engine allows
static const int numrooms = maxwidth * maxheight;
int contents[40 * 30 * numrooms];
short contents[40 * 30 * numrooms];
int vmult[30 * maxheight];
int numtrinkets();
int numcrewmates();