etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restructuring some of the cheat code

Browse source
This commit is contained in:
Vinícius R. Miguel 2020-05-17 21:06:38 -03:00
parent 2287fcce9f
commit 262963bf88
7 changed files with 41 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/game/mario.c
View file

@ -32,6 +32,7 @@
#include "level_table.h"
#include "thread6.h"
#include "pc/configfile.h"
#include "pc/cheats.h"
#ifdef BETTERCAMERA
#include "bettercamera.h"
#endif
@ -1397,12 +1398,14 @@ void update_mario_inputs(struct MarioState *m) {
update_mario_geometry_inputs(m);
debug_print_speed_action_normal(m);
/* Moonjump cheat */
while (cheatMoonjump == true && cheatEnablecheats == true && m->controller->buttonDown & L_TRIG ){
while (Cheats.MoonJump == true && Cheats.EnableCheats == true && m->controller->buttonDown & L_TRIG ){
m->vel[1] = 25;
break;
break; // TODO: Unneeded break?
}
/*End of moonjump cheat */
if (gCameraMovementFlags & CAM_MOVE_C_UP_MODE) {
if (m->action & ACT_FLAG_ALLOW_FIRST_PERSON) {
m->input |= INPUT_FIRST_PERSON;
@ -1726,17 +1729,17 @@ s32 execute_mario_action(UNUSED struct Object *o) {
/**
* Cheat stuff
*/
while (cheatGodmode == true && cheatEnablecheats == true){
gMarioState->health = 0x880;
break;
}
while (cheatInfinitelives == true && cheatEnablecheats == true && gMarioState->numLives < 99){
gMarioState->numLives += 1;
break;
}
while (cheatSuperspeed == true && cheatEnablecheats == true && gMarioState->forwardVel > 0 ){
gMarioState->forwardVel += 100;
break;
if (Cheats.EnableCheats)
{
if (Cheats.GodMode)
gMarioState->health = 0x880;
if (Cheats.InfiniteLives && gMarioState->numLives < 99)
gMarioState->numLives += 1;
if (Cheats.SuperSpeed && gMarioState->forwardVel > 0)
gMarioState->forwardVel += 100;
}
/**
* End of cheat stuff

8
src/game/mario_actions_moving.c
View file

@ -13,6 +13,7 @@
#include "behavior_data.h"
#include "thread6.h"
#include "pc/configfile.h"
#include "pc/cheats.h"
struct LandingAction {
s16 numFrames;
@ -464,13 +465,12 @@ void update_walking_speed(struct MarioState *m) {
/* Handles the "Super responsive controls" cheat. The content of the "else" is Mario's original code for turning around.*/
if (cheatResponsive == true && cheatEnablecheats == true ) {
if (Cheats.Responsive == true && Cheats.EnableCheats == true ) {
m->faceAngle[1] = m->intendedYaw;
}
else {
m->faceAngle[1] =
m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800);
}
m->faceAngle[1] = m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800);
}
apply_slope_accel(m);
}

13
src/game/options_menu.c
View file

@ -18,6 +18,7 @@
#include "game/options_menu.h"
#include "pc/pc_main.h"
#include "pc/cliopts.h"
#include "pc/cheats.h"
#include "pc/configfile.h"
#include "pc/controller/controller_api.h"
@ -219,12 +220,12 @@ static struct Option optsAudio[] = {
};
static struct Option optsCheats[] = {
DEF_OPT_TOGGLE( optsCheatsStr[0], &cheatEnablecheats ),
DEF_OPT_TOGGLE( optsCheatsStr[1], &cheatMoonjump ),
DEF_OPT_TOGGLE( optsCheatsStr[2], &cheatGodmode ),
DEF_OPT_TOGGLE( optsCheatsStr[3], &cheatInfinitelives ),
DEF_OPT_TOGGLE( optsCheatsStr[4], &cheatSuperspeed),
DEF_OPT_TOGGLE( optsCheatsStr[5], &cheatResponsive),
DEF_OPT_TOGGLE( optsCheatsStr[0], &Cheats.EnableCheats ),
DEF_OPT_TOGGLE( optsCheatsStr[1], &Cheats.MoonJump ),
DEF_OPT_TOGGLE( optsCheatsStr[2], &Cheats.GodMode ),
DEF_OPT_TOGGLE( optsCheatsStr[3], &Cheats.InfiniteLives ),
DEF_OPT_TOGGLE( optsCheatsStr[4], &Cheats.SuperSpeed),
DEF_OPT_TOGGLE( optsCheatsStr[5], &Cheats.Responsive),
};

1
src/pc/cheats.c Normal file
View file

@ -0,0 +1 @@
struct CheatList Cheats;

13
src/pc/cheats.h Normal file
View file

@ -0,0 +1,13 @@
#include <stdbool.h>
struct CheatList
{
bool EnableCheats;
bool MoonJump;
bool GodMode;
bool InfiniteLives;
bool SuperSpeed;
bool Responsive;
};
extern struct CheatList Cheats;

9
src/pc/configfile.c
View file

@ -37,15 +37,6 @@ bool configFullscreen = false;
unsigned int configFiltering = 1; // 0=force nearest, 1=linear, (TODO) 2=three-point
unsigned int configMasterVolume = MAX_VOLUME; // 0 - MAX_VOLUME
// Cheat stuff
bool cheatEnablecheats = false;
bool cheatMoonjump = false;
bool cheatGodmode = false;
bool cheatInfinitelives = false;
bool cheatSuperspeed = false;
bool cheatResponsive = false;
// Keyboard mappings (VK_ values, by default keyboard/gamepad/mouse)
unsigned int configKeyA[MAX_BINDS] = { 0x0026, 0x1000, 0x1103 };
unsigned int configKeyB[MAX_BINDS] = { 0x0033, 0x1002, 0x1101 };

6
src/pc/configfile.h
View file

@ -24,12 +24,6 @@ extern unsigned int configKeyStickUp[];
extern unsigned int configKeyStickDown[];
extern unsigned int configKeyStickLeft[];
extern unsigned int configKeyStickRight[];
extern bool cheatMoonjump;
extern bool cheatGodmode;
extern bool cheatEnablecheats;
extern bool cheatInfinitelives;
extern bool cheatSuperspeed;
extern bool cheatResponsive;
#ifdef BETTERCAMERA
extern unsigned int configCameraXSens;
extern unsigned int configCameraYSens;