Change saplings to not instantly grow when placed in singleplayer

Also change PSP to always load from PSP/GAME/ClassiCube folder on the memory stick
This commit is contained in:
UnknownShadow200 2024-03-21 17:13:52 +11:00
parent 5c4b85abf9
commit b7d92bc8b9
4 changed files with 10 additions and 6 deletions

View File

@ -62,6 +62,7 @@ cc_result Audio_Play(struct AudioContext* ctx);
/* Returns the number of buffers being played or queued */
/* (e.g. if inUse is 0, no audio buffers are being played or queued) */
cc_result Audio_Poll(struct AudioContext* ctx, int* inUse);
cc_result Audio_Pause(struct AudioContext* ctx); /* Only implemented with OpenSL ES backend */
/* Plays the given audio data */
cc_result Audio_PlayData(struct AudioContext* ctx, struct AudioData* data);

View File

@ -698,7 +698,7 @@ cc_result Audio_QueueChunk(struct AudioContext* ctx, void* chunk, cc_uint32 size
return (*ctx->playerQueue)->Enqueue(ctx->playerQueue, chunk, size);
}
static cc_result Audio_Pause(struct AudioContext* ctx) {
cc_result Audio_Pause(struct AudioContext* ctx) {
return (*ctx->playerPlayer)->SetPlayState(ctx->playerPlayer, SL_PLAYSTATE_PAUSED);
}

View File

@ -527,7 +527,6 @@ void Physics_Init(void) {
Physics.OnRandomTick[BLOCK_SAND] = Physics_DoFalling;
Physics.OnRandomTick[BLOCK_GRAVEL] = Physics_DoFalling;
Physics.OnPlace[BLOCK_SAPLING] = Physics_HandleSapling;
Physics.OnRandomTick[BLOCK_SAPLING] = Physics_HandleSapling;
Physics.OnRandomTick[BLOCK_DIRT] = Physics_HandleDirt;
Physics.OnRandomTick[BLOCK_GRASS] = Physics_HandleGrass;

View File

@ -85,11 +85,12 @@ cc_uint64 Stopwatch_Measure(void) {
/*########################################################################################################################*
*-----------------------------------------------------Directory/File------------------------------------------------------*
*#########################################################################################################################*/
extern int __path_absolute(const char *in, char *out, int len);
static const cc_string root_path = String_FromConst("ms0:/PSP/GAME/ClassiCube/");
static void GetNativePath(char* str, const cc_string* path) {
char tmp[NATIVE_STR_LEN + 1];
String_EncodeUtf8(tmp, path);
__path_absolute(tmp, str, NATIVE_STR_LEN);
Mem_Copy(str, root_path.buffer, root_path.length);
str += root_path.length;
String_EncodeUtf8(str, path);
}
#define GetSCEResult(result) (result >= 0 ? 0 : result & 0xFFFF)
@ -438,6 +439,9 @@ void Platform_Init(void) {
// *tx = vel->x == 0.0f ? MATH_LARGENUM : Math_AbsF(dx / vel->x);
// TODO: work out why this error is actually happening (inexact or underflow?) and properly fix it
pspSdkDisableFPUExceptions();
// Create root directory
Directory_Create(&String_Empty);
}
void Platform_Free(void) { }