this repo has no description
Revert "WIP WIP WIP"
This reverts commit a57fdae5e8358940ced14dfc33e8b256c348c49f.
+12
-113
-2
include/tic80_types.h
-2
include/tic80_types.h
+5
-12
src/cart.c
+5
-12
src/cart.c
···
95
95
// iterate on chunks until we find a cartridge
96
96
while (ptr < end)
97
97
{
98
-
// alice was here
99
-
// siz = ((ptr[0] << 24) | (ptr[1] << 16) | (ptr[2] << 8) | ptr[3]);
100
-
uint32_t size;
101
-
memcpy(&size, ptr, sizeof(uint32_t));
102
-
siz = ntohl(size); // Ensure correct endianness
98
+
siz = ((ptr[0] << 24) | (ptr[1] << 16) | (ptr[2] << 8) | ptr[3]);
103
99
if (!memcmp(ptr + 4, "caRt", 4) && siz > 0)
104
100
{
105
101
chunk_cart = malloc(sizeof(tic_cartridge));
···
125
121
const u8* ptr = buffer;
126
122
while (ptr < end)
127
123
{
128
-
// const Chunk* chunk = (Chunk*)ptr;
129
-
// ptr += sizeof(Chunk);
130
-
131
-
const Chunk* chunk = (Chunk*)(ptr + (sizeof(Chunk) - ((uintptr_t)ptr % sizeof(Chunk))) % sizeof(Chunk));
132
-
ptr = (const u8*)chunk + sizeof(Chunk);
124
+
const Chunk* chunk = (Chunk*)ptr;
125
+
ptr += sizeof(Chunk);
133
126
134
127
switch (chunk->type)
135
128
{
···
164
157
const u8* ptr = buffer;
165
158
while(ptr < end)
166
159
{
167
-
const Chunk* chunk = (Chunk*)(ptr + (sizeof(Chunk) - ((uintptr_t)ptr % sizeof(Chunk))) % sizeof(Chunk));
168
-
ptr = (const u8*)chunk + sizeof(Chunk);
160
+
const Chunk* chunk = (Chunk*)ptr;
161
+
ptr += sizeof(Chunk);
169
162
170
163
switch(chunk->type)
171
164
{
+1
-36
src/core/io.c
+1
-36
src/core/io.c
···
143
143
tic->ram->input.gamepads.data |= 1 << i;
144
144
145
145
// process gamepad
146
-
for (s32 i = 0; i < COUNT_OF(core->state.gamepads.holds) && i < 32; i++)
146
+
for (s32 i = 0; i < COUNT_OF(core->state.gamepads.holds); i++)
147
147
{
148
148
u32 mask = 1 << i;
149
149
u32 prevDown = core->state.gamepads.previous.data & mask;
···
166
166
else *hold = 0;
167
167
}
168
168
}
169
-
170
-
// void tic_core_tick_io(tic_mem* tic)
171
-
// {
172
-
// tic_core* core = (tic_core*)tic;
173
-
174
-
// // process gamepads mapping
175
-
// u8* keycodes = tic->ram->mapping.data;
176
-
// for(s32 i = 0; i < sizeof(tic_mapping); ++i)
177
-
// if(keycodes[i] && tic_api_key(tic, keycodes[i]))
178
-
// tic->ram->input.gamepads.data |= 1 << i;
179
-
180
-
// // process gamepad
181
-
// for (s32 i = 0; i < COUNT_OF(core->state.gamepads.holds); i++)
182
-
// {
183
-
// u32 mask = 1 << i;
184
-
// u32 prevDown = core->state.gamepads.previous.data & mask;
185
-
// u32 down = tic->ram->input.gamepads.data & mask;
186
-
187
-
// u32* hold = &core->state.gamepads.holds[i];
188
-
// if (prevDown && prevDown == down) (*hold)++;
189
-
// else *hold = 0;
190
-
// }
191
-
192
-
// // process keyboard
193
-
// for (s32 i = 0; i < tic_keys_count; i++)
194
-
// {
195
-
// bool prevDown = isKeyPressed(&core->state.keyboard.previous, i);
196
-
// bool down = isKeyPressed(&tic->ram->input.keyboard, i);
197
-
198
-
// u32* hold = &core->state.keyboard.holds[i];
199
-
200
-
// if (prevDown && down) (*hold)++;
201
-
// else *hold = 0;
202
-
// }
203
-
// }
+2
-5
src/studio/screens/console.c
+2
-5
src/studio/screens/console.c
···
1335
1335
1336
1336
// Calculate remaining buffer space
1337
1337
size_t currentLength = strlen(data->options);
1338
-
// ASAN GIVE IT TWICE THE CONSOLE_BUFFER_SCREEN FOR FUNSIES
1339
-
size_t availableSpace = (CONSOLE_BUFFER_SCREEN * 2) - currentLength - 1; // -1 for null terminator
1338
+
size_t availableSpace = CONSOLE_BUFFER_SCREEN - currentLength - 1; // -1 for null terminator
1340
1339
1341
1340
if (strlen(option) + 1 > availableSpace) { // +1 for the space character
1342
1341
printf("ASAN Error: Not enough buffer space to add option: %s\n", option);
···
3580
3579
TabCompleteData newTabCompleteData(Console* console, char* incompleteWord) {
3581
3580
TabCompleteData data = { console, .incompleteWord = incompleteWord };
3582
3581
printf("BEFORE MALLOC1 IN newTabCompleteData\n");
3583
-
// data.options = malloc(CONSOLE_BUFFER_SCREEN);
3584
-
printf("ASAN FUCK IT WE MALLOC TWICE AS MUCH\n");
3585
-
data.options = malloc(CONSOLE_BUFFER_SCREEN * 2);
3582
+
data.options = malloc(CONSOLE_BUFFER_SCREEN);
3586
3583
printf("BEFORE MALLOC2 IN newTabCompleteData\n");
3587
3584
data.commonPrefix = malloc(CONSOLE_BUFFER_SCREEN);
3588
3585
+4
-58
src/studio/studio.c
+4
-58
src/studio/studio.c
···
951
951
return x;
952
952
}
953
953
954
-
// static void animTick(Movie* movie)
955
-
// {
956
-
// for(Anim* it = movie->items, *end = it + movie->count; it != end; ++it)
957
-
// {
958
-
// float tick = (float)(movie->tick < it->time ? movie->tick : it->time);
959
-
// *it->value = lerp(it->start, it->end, animEffect(it->effect, tick / it->time));
960
-
// }
961
-
// }
962
-
963
-
// static void animTick(Movie* movie)
964
-
// {
965
-
// printf("Starting animTick, movie: %p\n", (void*)movie);
966
-
// if (!movie) {
967
-
// printf("Error: movie is NULL\n");
968
-
// return;
969
-
// }
970
-
971
-
// printf("Movie count: %d\n", movie->count);
972
-
// for(Anim* it = movie->items, *end = it + movie->count; it != end; ++it)
973
-
// {
974
-
// printf("Processing animation item, it: %p\n", (void*)it);
975
-
// if(it->value && it->start && it->end && it->effect) {
976
-
// float tick = (float)(movie->tick < it->time ? movie->tick : it->time);
977
-
// printf("tick: %f, it->time: %" PRId32 "\n", tick, it->time);
978
-
// printf("it->start: %" PRId32 ", it->end: %" PRId32 ", it->effect: %p\n", it->start, it->end, (void*)it->effect);
979
-
// *it->value = lerp(it->start, it->end, animEffect(it->effect, tick / it->time));
980
-
// printf("Updated it->value: %d\n", *it->value);
981
-
// } else {
982
-
// printf("Null pointer detected (it->value: %p, it->start: %" PRId32 ", it->end: %" PRId32 ", it->effect: %p)\n", (void*)it->value, it->start, it->end, (void*)it->effect);
983
-
// }
984
-
// }
985
-
// printf("Finished animTick\n");
986
-
// }
987
-
988
954
static void animTick(Movie* movie)
989
955
{
990
-
printf("Starting animTick, movie: %p\n", (void*)movie);
991
-
if (!movie) {
992
-
printf("Error: movie is NULL\n");
993
-
return;
956
+
for(Anim* it = movie->items, *end = it + movie->count; it != end; ++it)
957
+
{
958
+
float tick = (float)(movie->tick < it->time ? movie->tick : it->time);
959
+
*it->value = lerp(it->start, it->end, animEffect(it->effect, tick / it->time));
994
960
}
995
-
996
-
printf("Movie count: %d\n", movie->count);
997
-
if (movie->items) {
998
-
for(Anim* it = movie->items, *end = movie->items + movie->count; it != end; ++it)
999
-
{
1000
-
printf("Processing animation item, it: %p\n", (void*)it);
1001
-
if(it->value && it->start && it->end && it->effect) {
1002
-
float tick = (float)(movie->tick < it->time ? movie->tick : it->time);
1003
-
printf("tick: %f, it->time: %" PRId32 "\n", tick, it->time);
1004
-
printf("it->start: %" PRId32 ", it->end: %" PRId32 ", it->effect: %p\n", it->start, it->end, (void*)it->effect);
1005
-
*it->value = lerp(it->start, it->end, animEffect(it->effect, tick / it->time));
1006
-
printf("Updated it->value: %d\n", *it->value);
1007
-
} else {
1008
-
printf("Null pointer detected (it->value: %p, it->start: %" PRId32 ", it->end: %" PRId32 ", it->effect: %p)\n", (void*)it->value, it->start, it->end, (void*)it->effect);
1009
-
}
1010
-
}
1011
-
} else {
1012
-
printf("movie->items is NULL\n");
1013
-
}
1014
-
printf("Finished animTick\n");
1015
961
}
1016
962
1017
963
void processAnim(Movie* movie, void* data)