summaryrefslogtreecommitdiff
path: root/apps/plugins/doom/wi_stuff.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-09-18 06:00:05 -0400
committerMichael Sevakis <jethead71@rockbox.org>2017-11-21 05:01:14 -0500
commitaced667f48c29a160aa4e5c0a8df037092b28189 (patch)
tree66e48e4a27daaf36f01d7ff1ed6876a7de38b0c0 /apps/plugins/doom/wi_stuff.c
parent5c9688961ef9166cec5225db50d5f73691d8292d (diff)
downloadrockbox-aced667f48c29a160aa4e5c0a8df037092b28189.tar.gz
rockbox-aced667f48c29a160aa4e5c0a8df037092b28189.zip
Undo hacks to meant to get around string formatting limitations
The new vuprintf makes unnecessary workarounds due to formatting limitations. I checked grep output for whatever appeared to fit but it's possible I missed some instances because they weren't so obvious. Also, this means sound settings can dynamically work with any number of decimals rather than the current assumption of one or two. Add an ipow() function to help and take advantage of dynamic field width and precision. Consolidate string formatting of sound settings. Change-Id: I46caf534859dfd1916cd440cd25e5206b192fcd8
Diffstat (limited to 'apps/plugins/doom/wi_stuff.c')
-rw-r--r--apps/plugins/doom/wi_stuff.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/plugins/doom/wi_stuff.c b/apps/plugins/doom/wi_stuff.c
index 7c7831d084..b73839f55b 100644
--- a/apps/plugins/doom/wi_stuff.c
+++ b/apps/plugins/doom/wi_stuff.c
@@ -397,8 +397,7 @@ void WI_unloadData(void);
397void WI_levelNameLump(int epis, int map, char* buf, int bsize) 397void WI_levelNameLump(int epis, int map, char* buf, int bsize)
398{ 398{
399 if (gamemode == commercial) { 399 if (gamemode == commercial) {
400 snprintf(buf, bsize,"CWILV%s%d",(map/10>0?"":"0"), map); //ANOTHER ROCKHACK "CWILV%2.2d" 400 snprintf(buf,bsize, "CWILV%2.2d", map);
401 //snprintf(buf,bsize, "CWILV%2.2d", map);
402 } else { 401 } else {
403 snprintf(buf,bsize, "WILV%d%d", epis, map); 402 snprintf(buf,bsize, "WILV%d%d", epis, map);
404 } 403 }
@@ -1829,8 +1828,7 @@ void WI_loadData(void)
1829 if (wbs->epsd != 1 || j != 8) 1828 if (wbs->epsd != 1 || j != 8)
1830 { 1829 {
1831 // animations 1830 // animations
1832 snprintf(name, sizeof(name),"WIA%d%s%d%s%d", wbs->epsd, (j/10>0?"":"0"), j,(i/10>0?"":"0"), i); //ANOTHER ROCKHACK 1831 snprintf(name, sizeof(name),"WIA%d%.2d%.2d", wbs->epsd, j, i);
1833 //snprintf(name, sizeof(name),"WIA%d%.2d%.2d", wbs->epsd, j, i);
1834 a->p[i] = W_CacheLumpName(name); 1832 a->p[i] = W_CacheLumpName(name);
1835 } 1833 }
1836 else 1834 else
@@ -1872,8 +1870,7 @@ void WI_unloadData(void)
1872 // MONDO HACK! 1870 // MONDO HACK!
1873 if (wbs->epsd != 1 || j != 8) { 1871 if (wbs->epsd != 1 || j != 8) {
1874 // animations 1872 // animations
1875 snprintf(name, sizeof(name),"WIA%d%s%d%s%d", wbs->epsd, (j/10>0?"":"0"), j,(i/10>0?"":"0"), i); //ANOTHER ROCKHACK 1873 snprintf(name,sizeof(name), "WIA%d%.2d%.2d", wbs->epsd, j, i);
1876 //snprintf(name,sizeof(name), "WIA%d%.2d%.2d", wbs->epsd, j, i);
1877 W_UnlockLumpName(name); 1874 W_UnlockLumpName(name);
1878 } 1875 }
1879 } 1876 }