thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AVALANCHE: Janitorial - Remove trailing spaces, fix define names

Browse source
This commit is contained in:
Strangerke 2013-09-07 09:00:34 +02:00
parent 7be84e9d52
commit e859e17e3b
34 changed files with 293 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/avalanche/acci2.h
View file

@ -27,8 +27,8 @@
/* ACCIDENCE II The parser. */
#ifndef ACCI2_H
#define ACCI2_H
#ifndef AVALANCHE_ACCI2_H
#define AVALANCHE_ACCI2_H
#include "common/scummsys.h"
#include "common/str.h"
@ -132,4 +132,4 @@ private:
} // End of namespace Avalanche.
#endif // ACCI2_H
#endif // AVALANCHE_ACCI2_H

6
engines/avalanche/avalanche.h
View file

@ -25,8 +25,8 @@
* Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
*/
#ifndef AVALANCHE_H
#define AVALANCHE_H
#ifndef AVALANCHE_AVALANCHE_H
#define AVALANCHE_AVALANCHE_H
#include "avalanche/console.h"
@ -172,4 +172,4 @@ private:
} // End of namespace Avalanche
#endif // AVALANCHE_H
#endif // AVALANCHE_AVALANCHE_H

6
engines/avalanche/avalot.h
View file

@ -27,8 +27,8 @@
/* AVALOT The kernel of the program. */
#ifndef AVALOT_H
#define AVALOT_H
#ifndef AVALANCHE_AVALOT_H
#define AVALANCHE_AVALOT_H
#include "common/events.h"
#include "common/system.h"
@ -50,4 +50,4 @@ private:
} // End of namespace Avalanche
#endif // AVALOT_H
#endif // AVALANCHE_AVALOT_H

6
engines/avalanche/celer2.h
View file

@ -27,8 +27,8 @@
/* CELER The unit for updating the screen pics. */
#ifndef CELER2_H
#define CELER2_H
#ifndef AVALANCHE_CELER2_H
#define AVALANCHE_CELER2_H
#include "common/scummsys.h"
#include "common/file.h"
@ -78,4 +78,4 @@ private:
} // End of namespace Avalanche.
#endif // CELER2_H
#endif // AVALANCHE_CELER2_H

6
engines/avalanche/closing2.h
View file

@ -27,8 +27,8 @@
/* CLOSING The closing screen and error handler. */
#ifndef CLOSING2_H
#define CLOSING2_H
#ifndef AVALANCHE_CLOSING2_H
#define AVALANCHE_CLOSING2_H
#include "common/scummsys.h"
#include "common/str.h"
@ -68,4 +68,4 @@ private:
} // End of namespace Avalanche.
#endif // CLOSING2_H
#endif // AVALANCHE_CLOSING2_H

6
engines/avalanche/color.h
View file

@ -27,8 +27,8 @@
// Color constants replacing the colors from the CRT unit of Pascal
#ifndef COLOR_H
#define COLOR_H
#ifndef AVALANCHE_COLOR_H
#define AVALANCHE_COLOR_H
#include "common/system.h"
@ -55,4 +55,4 @@ enum Color {
} // End of namespace Avalanche
#endif // COLOR_H
#endif // AVALANCHE_COLOR_H

6
engines/avalanche/dropdown2.h
View file

@ -27,8 +27,8 @@
/* DROPDOWN A customised version of Oopmenu (qv). */
#ifndef DROPDOWN2_H
#define DROPDOWN2_H
#ifndef AVALANCHE_DROPDOWN2_H
#define AVALANCHE_DROPDOWN2_H
#include "avalanche/color.h"
@ -164,4 +164,4 @@ private:
} // End of namespace Avalanche.
#endif // DROPDOWN2_H
#endif // AVALANCHE_DROPDOWN2_H

6
engines/avalanche/enid2.h
View file

@ -27,8 +27,8 @@
/* ENID Edna's manager. Loads/saves files. */
#ifndef ENID2_H
#define ENID2_H
#ifndef AVALANCHE_ENID2_H
#define AVALANCHE_ENID2_H
#include "common/scummsys.h"
@ -75,4 +75,4 @@ private:
} // End of namespace Avalanche.
#endif // ENID2_H
#endif // AVALANCHE_ENID2_H

6
engines/avalanche/graphics.h
View file

@ -25,8 +25,8 @@
* Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
*/
#ifndef GRAPHICS_H
#define GRAPHICS_H
#ifndef AVALANCHE_GRAPHICS_H
#define AVALANCHE_GRAPHICS_H
#include "common/file.h"
@ -100,4 +100,4 @@ private:
} // End of namespace Avalanche
#endif // GRAPHICS_H
#endif // AVALANCHE_GRAPHICS_H

6
engines/avalanche/gyro2.h
View file

@ -27,8 +27,8 @@
/* GYRO It all revolves around this bit! */
#ifndef GYRO2_H
#define GYRO2_H
#ifndef AVALANCHE_GYRO2_H
#define AVALANCHE_GYRO2_H
#include "common/str.h"
#include "common/scummsys.h"
@ -497,4 +497,4 @@ private:
} // End of namespace Avalanche
#endif // GYRO2_H
#endif // AVALANCHE_GYRO2_H

6
engines/avalanche/lucerna2.h
View file

@ -27,8 +27,8 @@
/* LUCERNA The screen, [keyboard] and mouse handler.*/
#ifndef LUCERNA2_H
#define LUCERNA2_H
#ifndef AVALANCHE_LUCERNA2_H
#define AVALANCHE_LUCERNA2_H
#include "common/scummsys.h"
#include "common/file.h"
@ -139,4 +139,4 @@ private:
} // End of namespace Avalanche
#endif // LUCERNA2_H
#endif // AVALANCHE_LUCERNA2_H

6
engines/avalanche/parser.h
View file

@ -25,8 +25,8 @@
* Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
*/
#ifndef PARSER_H
#define PARSER_H
#ifndef AVALANCHE_PARSER_H
#define AVALANCHE_PARSER_H
#include "common/events.h"
@ -77,4 +77,4 @@ private:
} // End of namespace Avalanche
#endif // PARSER_H
#endif // AVALANCHE_PARSER_H

6
engines/avalanche/pingo2.h
View file

@ -27,8 +27,8 @@
/* PINGO Full-screen sub-parts of the game. */
#ifndef PINGO2_H
#define PINGO2_H
#ifndef AVALANCHE_PINGO2_H
#define AVALANCHE_PINGO2_H
#include "common/scummsys.h"
#include "common/str.h"
@ -64,4 +64,4 @@ private:
} // End of namespace Avalanche.
#endif // PINGO2_H
#endif // AVALANCHE_PINGO2_H

6
engines/avalanche/roomnums.h
View file

@ -25,8 +25,8 @@
* Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
*/
#ifndef ROOMNUMS_H
#define ROOMNUMS_H
#ifndef AVALANCHE_ROOMNUMS_H
#define AVALANCHE_ROOMNUMS_H
#include "common/system.h"
@ -85,4 +85,4 @@ const byte r__map = 99;
} // End of namespace Avalanche
#endif // ROOMNUMS_H
#endif // AVALANCHE_ROOMNUMS_H

6
engines/avalanche/scrolls2.h
View file

@ -27,8 +27,8 @@
/* SCROLLS The scroll driver. */
#ifndef SCROLLS2_H
#define SCROLLS2_H
#ifndef AVALANCHE_SCROLLS2_H
#define AVALANCHE_SCROLLS2_H
#include "common/system.h"
@ -150,4 +150,4 @@ private:
} // End of namespace Avalanche
#endif // SCROLLS2_H
#endif // AVALANCHE_SCROLLS2_H

6
engines/avalanche/sequence2.h
View file

@ -27,8 +27,8 @@
/* SEQUENCE The sequencer. */
#ifndef SEQUENCE2_H
#define SEQUENCE2_H
#ifndef AVALANCHE_SEQUENCE2_H
#define AVALANCHE_SEQUENCE2_H
#include "common/scummsys.h"
@ -68,4 +68,4 @@ private:
} // End of namespace Avalanche.
#endif // SEQUENCE2_H
#endif // AVALANCHE_SEQUENCE2_H

6
engines/avalanche/timeout2.h
View file

@ -27,8 +27,8 @@
/* TIMEOUT The scheduling unit. */
#ifndef TIMEOUT2_H
#define TIMEOUT2_H
#ifndef AVALANCHE_TIMEOUT2_H
#define AVALANCHE_TIMEOUT2_H
#include "common/scummsys.h"
@ -222,4 +222,4 @@ private:
} // End of namespace Avalanche.
#endif // TIMEOUT2_H
#endif // AVALANCHE_TIMEOUT2_H

60
engines/avalanche/trip6.h
View file

@ -28,8 +28,8 @@
/* TRIP5 Trippancy V - the sprite animation subsystem */
#ifndef TRIP6_H
#define TRIP6_H
#ifndef AVALANCHE_TRIP6_H
#define AVALANCHE_TRIP6_H
#include "avalanche/graphics.h"
@ -120,12 +120,9 @@ private:
Trip *_tr;
bool collision_check();
int8 sgn(int16 val);
};
const int16 maxgetset = 35;
class getsettype {
@ -138,18 +135,11 @@ public:
void recall(ByteField &r);
};
class Trip {
public:
friend class triptype;
friend class getsettype;
static const int16 up = 0;
static const int16 right = 1;
static const int16 down = 2;
@ -162,69 +152,37 @@ public:
static const int16 numtr = 5; // current max no. of sprites
static const int16 procfollow_avvy_y = 1;
static const int16 procback_and_forth = 2;
static const int16 procface_avvy = 3;
static const int16 procarrow_procs = 4;
static const int16 procspludwick_procs = 5;
static const int16 procgrab_avvy = 6;
static const int16 procgeida_procs = 7;
Trip(AvalancheEngine *vm);
~Trip();
void trippancy_link();
void get_back_loretta();
void loadtrip();
void call_special(uint16 which);
void open_the_door(byte whither, byte ped, byte magicnum); // Handles slidey-open doors.
void catamove(byte ped);
void stopwalking();
void tripkey(char dir);
void rwsp(byte t, byte dir);
void apped(byte trn, byte np);
void getback();
void fliproom(byte room, byte ped);
bool infield(byte which); // Returns true if you're within field "which".
bool neardoor(); // Returns True if you're near a door.
void readstick();
void newspeed();
void new_game_for_trippancy();
void take_a_step(byte &tripnum);
void handleMoveKey(const Common::Event &event); // To replace tripkey().
triptype tr[numtr];
getsettype getset[2];
byte aa[1600];
@ -240,32 +198,20 @@ private:
// int16 beforex, beforey;
byte checkfeet(int16 x1, int16 x2, int16 oy, int16 y, byte yl);
byte geida_ped(byte which);
void dawndelay();
void hide_in_the_cupboard();
void follow_avvy_y(byte tripnum);
void back_and_forth(byte tripnum);
void face_avvy(byte tripnum);
void arrow_procs(byte tripnum);
void grab_avvy(byte tripnum);
void spin(byte whichway, byte &tripnum);
void geida_procs(byte tripnum);
void call_andexors();
void getsetclear();
};
} // End of namespace Avalanche.
#endif // TRIP6_H
#endif // AVALANCHE_TRIP6_H

6
engines/avalanche/visa2.h
View file

@ -27,8 +27,8 @@
/* VISA The new Sez handler. (Replaces Access.) */
#ifndef VISA2_H
#define VISA2_H
#ifndef AVALANCHE_VISA2_H
#define AVALANCHE_VISA2_H
#include "common/scummsys.h"
@ -60,4 +60,4 @@ private:
} // End of namespace Avalanche.
#endif // VISA2_H
#endif // AVALANCHE_VISA2_H