Remove cvector and ivector
FossilOrigin-Name: 5bbd6d8ddd29ca99ebd4b494d11fea537f9567483fc9be14932846ece1503563
This commit is contained in:
parent
0bd8f1920f
commit
b8b9ef2e79
4 changed files with 97 additions and 51 deletions
28
src/sound.mm
28
src/sound.mm
|
@ -128,15 +128,29 @@ vector<Mix_Chunk *> samples;
|
|||
vector<FSOUND_SAMPLE *> samples;
|
||||
#endif
|
||||
|
||||
cvector snames;
|
||||
static OFMutableArray<OFString *> *snames;
|
||||
|
||||
int
|
||||
registersound(char *name)
|
||||
registersound(char *name_)
|
||||
{
|
||||
loopv(snames) if (strcmp(snames[i], name) == 0) return i;
|
||||
snames.add(newstring(name));
|
||||
samples.add(NULL);
|
||||
return samples.length() - 1;
|
||||
@autoreleasepool {
|
||||
OFString *name = @(name_);
|
||||
|
||||
int i = 0;
|
||||
for (OFString *iter in snames) {
|
||||
if ([iter isEqual:name])
|
||||
return i;
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
if (snames == nil)
|
||||
snames = [[OFMutableArray alloc] init];
|
||||
|
||||
[snames addObject:name];
|
||||
samples.add(NULL);
|
||||
return samples.length() - 1;
|
||||
}
|
||||
}
|
||||
COMMAND(registersound, ARG_1EST)
|
||||
|
||||
|
@ -240,7 +254,7 @@ playsound(int n, OFVector3D *loc)
|
|||
|
||||
if (!samples[n]) {
|
||||
OFString *path = [OFString
|
||||
stringWithFormat:@"packages/sounds/%s.wav", snames[n]];
|
||||
stringWithFormat:@"packages/sounds/%@.wav", snames[n]];
|
||||
OFIRI *IRI = [Cube.sharedInstance.gameDataIRI
|
||||
IRIByAppendingPathComponent:path];
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue