forked from diasurgical/DevilutionX
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove 50% frames in diablo death and standby animations
- remove all death animations for knights (blackd.clx) except for the south-facing one (because they all look similar) and turn knight monsters south after they die and before the animation is loaded
Showing
11 changed files
with
170 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| // DREAMCAST memory stats related code | ||
|
|
||
| #include "memory_stats.h" | ||
|
|
||
| #include <dc/pvr.h> | ||
|
|
||
| #include <malloc.h> | ||
| #include <stdio.h> | ||
|
|
||
| static unsigned long systemRam = 0x00000000; | ||
| static unsigned long elfOffset = 0x00000000; | ||
| static unsigned long stackSize = 0x00000000; | ||
|
|
||
| extern unsigned long end; | ||
| extern unsigned long start; | ||
|
|
||
| #define _end end | ||
| #define _start start | ||
| void print_VRAM_stats() | ||
| { | ||
| pvr_mem_available(); | ||
| } | ||
|
|
||
| void set_system_ram() | ||
| { | ||
| systemRam = 0x8d000000 - 0x8c000000; | ||
| elfOffset = 0x8c000000; | ||
|
|
||
| stackSize = (int)&_end - (int)&_start + ((int)&_start - elfOffset); | ||
| } | ||
|
|
||
| unsigned long get_system_ram() | ||
| { | ||
| return systemRam; | ||
| } | ||
|
|
||
| unsigned long get_free_ram() | ||
| { | ||
| struct mallinfo mi = mallinfo(); | ||
| return systemRam - (mi.usmblks + stackSize); | ||
| } | ||
|
|
||
| void print_ram_stats() | ||
| { | ||
| float sys_ram, free_ram, used_ram, pvr_ram; | ||
| sys_ram = (float)get_system_ram() / (float)(1024 * 1024); | ||
| free_ram = (float)get_free_ram() / (float)(1024 * 1024); | ||
| used_ram = (sys_ram - free_ram); | ||
| // pvr_ram = (float)pvr_mem_available() / (float)(1024*1024); | ||
|
|
||
| printf("\n---------\nRAM stats (MB):\nTotal: %.2f, Free: %.2f, Used: %.2f, PVR: %.2f\n---------\n", sys_ram, free_ram, used_ram, pvr_ram); | ||
| // printf("\n---------\nRAM stats (MB):\nTotal: %.2f, Free: %.2f, Used: %.2f\n---------\n", sys_ram, free_ram, used_ram); | ||
| } | ||
|
|
||
| void get_ram_stats(float *sys_ram, float *free_ram, float *used_ram, float *pvr_ram) | ||
| { | ||
| *sys_ram = (float)get_system_ram() / (float)(1024 * 1024); | ||
| *free_ram = (float)get_free_ram() / (float)(1024 * 1024); | ||
| *used_ram = (*sys_ram - *free_ram); | ||
| if (pvr_ram) { | ||
| //*pvr_ram = (float)pvr_mem_available() / (float)(1024*1024); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #ifndef __MEMORY_STATS_H__ | ||
| #define __MEMORY_STATS_H__ 1 | ||
|
|
||
| void set_system_ram(); | ||
| void print_VRAM_stats(); | ||
| unsigned long get_system_ram(); | ||
| unsigned long get_free_ram(); | ||
| void print_ram_stats(); | ||
| void get_ram_stats(float *sys_ram, float *free_ram, float *used_ram, float *pvr_ram); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i DiabloUI/mainmenu.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i appfat.h && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i controls/devices/joystick.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i diablo.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i init.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i interfac.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i loadsave.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i main.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i msg.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i pfile.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i pfile.h && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i platform/locale.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i utils/display.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i utils/file_util.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i utils/paths.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i utils/sdl2_to_1_2_backports.cpp && | ||
| docker run --rm -it -v $(pwd):/app -w /app devilutionx-sdl2 clang-format -style=file -i utils/sdl_compat.h |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- assets/txtdata/monsters/monstdat.tsv 2024-10-07 01:53:20.352087707 +0100 | ||
| +++ monstdat.tsv 2024-12-01 00:14:59.000000000 +0100 | ||
| @@ -109,7 +109,7 @@ | ||
| MT_CABALIST Cabalist mage\mage mage\cnselgd Retail 128 2000 true false 12,1,20,8,28,20 1,1,1,1,1,1 15 16 29 120 120 Counselor CAN_OPEN_DOOR 2 110 8 14 30 0 0 0 0 0 Demon RESIST_MAGIC,RESIST_FIRE,IMMUNE_LIGHTNING IMMUNE_MAGIC,RESIST_FIRE,IMMUNE_LIGHTNING Bottom,Middle,Top 4929 | ||
| MT_ADVOCATE Advocate mage\mage mage\cnselbk Retail 128 2000 true false 12,1,20,8,28,20 1,1,1,1,1,1 16 16 30 145 145 Counselor CAN_OPEN_DOOR 3 120 8 15 25 0 0 0 0 0 Demon IMMUNE_MAGIC,RESIST_FIRE,IMMUNE_LIGHTNING IMMUNE_MAGIC,IMMUNE_FIRE,IMMUNE_LIGHTNING Bottom,Middle,Top 4968 | ||
| MT_GOLEM Golem golem\golem golem\golm Never 96 386 true false 0,16,12,0,12,20 1,1,1,1,1,1 1 1 12 1 1 Golem CAN_OPEN_DOOR 0 0 7 1 1 0 0 0 0 1 Demon 0 | ||
| -MT_DIABLO The Dark Lord diablo\diablo Never 160 2000 true true 16,6,16,6,16,16 1,1,1,1,1,1 26 26 45 3333 3333 Diablo KNOCKBACK,SEARCH,CAN_OPEN_DOOR 3 220 4 30 60 0 11 0 0 90 Demon IMMUNE_MAGIC,RESIST_FIRE,RESIST_LIGHTNING IMMUNE_MAGIC,RESIST_FIRE,RESIST_LIGHTNING Bottom,Middle,Top 31666 | ||
| +MT_DIABLO The Dark Lord diablo\diablo Never 160 2000 true true 8,6,16,6,8,16 1,1,1,1,2,1 26 26 45 3333 3333 Diablo KNOCKBACK,SEARCH,CAN_OPEN_DOOR 3 220 4 30 60 0 11 0 0 90 Demon IMMUNE_MAGIC,RESIST_FIRE,RESIST_LIGHTNING IMMUNE_MAGIC,RESIST_FIRE,RESIST_LIGHTNING Bottom,Middle,Top 31666 | ||
| MT_DARKMAGE The Arch-Litch Malignus darkmage\dmage darkmage\dmag Never 128 1060 true false 6,1,21,6,23,18 1,1,1,1,1,1 21 21 30 160 160 Counselor CAN_OPEN_DOOR 3 120 8 20 40 0 0 0 0 70 Demon RESIST_MAGIC,RESIST_FIRE,RESIST_LIGHTNING IMMUNE_MAGIC,IMMUNE_FIRE,IMMUNE_LIGHTNING Bottom,Middle,Top 4968 | ||
| MT_HELLBOAR Hellboar fork\fork newsfx\hboar Retail 188 800 false false 10,10,15,6,16,0 2,1,1,1,1,1 17 18 23 80 100 SkeletonMelee KNOCKBACK,SEARCH 2 70 7 16 24 0 0 0 0 60 Demon RESIST_FIRE,RESIST_LIGHTNING Bottom,Middle 750 | ||
| MT_STINGER Stinger scorp\scorp newsfx\stingr Retail 64 305 false false 10,10,12,6,15,0 2,1,1,1,1,1 17 18 22 30 40 SkeletonMelee 3 85 8 1 20 0 0 0 0 50 Animal RESIST_LIGHTNING Bottom 500 |