Leahnaya/dance-maniax-update
1
0
Fork 0
mirror of https://github.com/AllenSeitz/dance-maniax-update.git synced 2026-09-07 09:35:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a new sanity check to the end of the song database.

Browse Source
This commit is contained in:
allen
2013-12-29 08:33:46 +00:00
parent 4d973c8068
commit 935e4b0183
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
deploy/DATA/DMX Songlist.ods
View File

Binary file not shown.

11
deploy/DATA/song_db.csv
View File

@@ -1,4 +1,4 @@
DMXDB,November 22nd 2013,113,1,,,,,,,,,,,,,
DMXDB,December 29th 2013,113,1,,,,,,,,,,,,,
101,BROKEN MY HEART,NAOKI feat.PAULA TERRY,160,160,DATA/mov/brok.seq,4,206,7,281,6,210,6,291,1,0,0
102,PUT YOUR FAITH IN ME,UZI-LAY,120,120,DATA/mov/puty.seq,1,128,5,176,3,176,5,222,1,0,0
103,GORGEOUS 2012,THE SURRENDERS,135,135,DATA/mov/gorg.seq,6,235,7,222,6,227,7,387,1,0,0
@@ -108,11 +108,8 @@ DMXDB,November 22nd 2013,113,1,,,,,,,,,,,,,
322,DYNAMITE RAVE |~super euro ver.~,NAOKI and Y&Co.,150,150,DATA/mov/luv2.seq,4,0,6,0,4,0,6,0,5,0,0
323,Popteen,Domino,151,151,DATA/mov/luv2.seq,2,0,6,0,3,0,6,0,5,0,0
324,Elemental Creation,dj TAKA meets DJ YOSHITAKA,212,424,DATA/mov/boss2.seq,6,310,9,527,6,312,10,541,5,1,0
325,Follow Tomorrow,HHHxMMxST,140,140,DATA/mov/peti.seq,4,0,7,0,5,0,7,0,5,0,1
326,Koko Soko (Akiba Koubou Remix),SMILE.DK,152,152,DATA/mov/peti.seq,3,0,7,0,5,0,7,0,5,0,1
325,Follow Tomorrow,HHHxMMxST,140,140,DATA/mov/peti.seq,4,0,8,0,5,0,8,0,5,0,1
326,Koko Soko |(Akiba Koubou Remix),SMILE.DK,152,152,DATA/mov/peti.seq,3,0,7,0,5,0,7,0,5,0,1
385,SUPER EURO NOW |~NONSTOP~ ,MIXED BY GU TEAM ,160,160,DATA/mov/bfor.seq,0,0,7,0,0,0,8,0,101,0,0
386,HIGH SPEED CONCLUSION,Ryutaro Nakahara,183,185,DATA/mov/bfor.seq,0,0,8,0,0,0,8,0,101,0,0
387,Xmix2,Non Stop Mix Special,150,150,DATA/mov/bfor.seq,0,0,0,0,0,0,0,0,0,0,0
388,Xmix3,Non Stop Mix Special,150,150,DATA/mov/bfor.seq,0,0,0,0,0,0,0,0,0,0,0
389,Xmix4,Non Stop Mix Special,150,150,DATA/mov/bfor.seq,0,0,0,0,0,0,0,0,0,0,0
390,Xmix5,Non Stop Mix Special,150,150,DATA/mov/bfor.seq,0,0,0,0,0,0,0,0,0,0,0
9999,End Of List,End of List,150,150,no,0,0,0,0,0,0,0,0,0,0,0
1 DMXDB November 22nd 2013 December 29th 2013 113 1
2 101 BROKEN MY HEART NAOKI feat.PAULA TERRY 160 160 DATA/mov/brok.seq 4 206 7 281 6 210 6 291 1 0 0
3 102 PUT YOUR FAITH IN ME UZI-LAY 120 120 DATA/mov/puty.seq 1 128 5 176 3 176 5 222 1 0 0
4 103 GORGEOUS 2012 THE SURRENDERS 135 135 DATA/mov/gorg.seq 6 235 7 222 6 227 7 387 1 0 0
108 322 DYNAMITE RAVE |~super euro ver.~ NAOKI and Y&Co. 150 150 DATA/mov/luv2.seq 4 0 6 0 4 0 6 0 5 0 0
109 323 Popteen Domino 151 151 DATA/mov/luv2.seq 2 0 6 0 3 0 6 0 5 0 0
110 324 Elemental Creation dj TAKA meets DJ YOSHITAKA 212 424 DATA/mov/boss2.seq 6 310 9 527 6 312 10 541 5 1 0
111 325 Follow Tomorrow HHHxMMxST 140 140 DATA/mov/peti.seq 4 0 7 8 0 5 0 7 8 0 5 0 1
112 326 Koko Soko (Akiba Koubou Remix) Koko Soko |(Akiba Koubou Remix) SMILE.DK 152 152 DATA/mov/peti.seq 3 0 7 0 5 0 7 0 5 0 1
113 385 SUPER EURO NOW |~NONSTOP~ MIXED BY GU TEAM 160 160 DATA/mov/bfor.seq 0 0 7 0 0 0 8 0 101 0 0
114 386 HIGH SPEED CONCLUSION Ryutaro Nakahara 183 185 DATA/mov/bfor.seq 0 0 8 0 0 0 8 0 101 0 0
115 387 9999 Xmix2 End Of List Non Stop Mix Special End of List 150 150 DATA/mov/bfor.seq no 0 0 0 0 0 0 0 0 0 0 0
388 Xmix3 Non Stop Mix Special 150 150 DATA/mov/bfor.seq 0 0 0 0 0 0 0 0 0 0 0
389 Xmix4 Non Stop Mix Special 150 150 DATA/mov/bfor.seq 0 0 0 0 0 0 0 0 0 0 0
390 Xmix5 Non Stop Mix Special 150 150 DATA/mov/bfor.seq 0 0 0 0 0 0 0 0 0 0 0

13
src/source/main.cpp
View File

@@ -1229,7 +1229,7 @@ int loadSongDB()
allegro_message("Unexpected version number in song_db.csv: found %d expected 1", verNum);
return -1;
}
fscanf_s(fp, "%[,] ", &sanityCheck, 32); // get rid of those commas
songIDs = (int *)malloc(sizeof(int) * NUM_SONGS);
@@ -1241,7 +1241,7 @@ int loadSongDB()
// now read a bunch of lines that look like:
// -> 101,BROKEN MY HEART,NAOKI feat.PAULA TERRY,brok.seq,4,0,7,0,6,0,6,0,1,0,0
for ( int i = 0; i < NUM_SONGS; i++ )
for ( int i = 0; i < NUM_SONGS+1; i++ )
{
int id = 0;
char name[64] = "";
@@ -1258,6 +1258,15 @@ int loadSongDB()
fscanf_s(fp, "%d,%[^,],%[^,],%d,%d,%[^,],%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d ", &id, &name, 64, &artist, 64, &minbpm, &maxbpm, &movie, 64, &sm, &smnotes, &sw, &swnotes, &dm, &dmnotes, &dw, &dwnotes, &version, &flag, &isNew);
if ( i == NUM_SONGS )
{
if ( id == 9999 )
{
break; // good! this was another sanity check
}
return -1; // the declared NUM_SONGS was incorrect
}
songIDs[i] = id;
songTitles[i].assign(name, strlen(name));
songArtists[i].assign(artist, strlen(artist));