Skip to content

updates from master project #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 29, 2020
Merged

updates from master project #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19cc4f8
Removed a color constant not being used
KonstantinosSykas Oct 2, 2020
6b45ec2
Fixed exception where nil would be passed as an object for a weapon s…
Oct 10, 2020
d3f5d40
Fixed an error reported by gcc on Fedora about format-security (#373)
bcoconni Oct 27, 2020
49d9e1a
Added Bertrand to list of contributors.
Oct 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Doc/contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Nicolas Boulenguez
CaptSolo
cbr
Eugene Chernyakov (seventh)
Bertrand Coconnier
colinh
Commander_X
Commander McLane
Expand Down
22 changes: 15 additions & 7 deletions src/Core/Entities/PlayerEntitySound.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,28 @@ - (void) setUpWeaponSounds
[shieldHitSounds setObject:@"[player-hit-by-weapon]" forKey:@"EQ_WEAPON_PLASMA_SHOT"];
[unshieldedHitSounds setObject:@"[player-direct-hit]" forKey:@"EQ_WEAPON_PLASMA_SHOT"];
// grab a local copy of the sound identifiers for weapons to make the process of looking up a sound ref as fast as possible
// but we must ensure that no nil values are used for setObject
#define OO_ASSIGN_SOUNDSTR_TO_SOUNDS(soundStr, sounds) do { \
fxString = [eqType soundStr]; \
if (!fxString) fxString = @""; \
[sounds setObject:fxString forKey:[eqType identifier]]; \
} while(0)

for (eqTypeEnum = [eqTypes objectEnumerator]; (eqType = [eqTypeEnum nextObject]); )
{
NSString *fxString = nil;
if ([[eqType identifier] hasPrefix:@"EQ_WEAPON"])
{
[shotMissSounds setObject:[eqType fxShotMissName] forKey:[eqType identifier]];
[shotHitSounds setObject:[eqType fxShotHitName] forKey:[eqType identifier]];
[shieldHitSounds setObject:[eqType fxShieldHitName] forKey:[eqType identifier]];
[unshieldedHitSounds setObject:[eqType fxUnshieldedHitName] forKey:[eqType identifier]];
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxShotMissName, shotMissSounds);
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxShotHitName, shotHitSounds);
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxShieldHitName, shieldHitSounds);
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxUnshieldedHitName, unshieldedHitSounds);
}
if ([eqType isMissileOrMine])
{
[weaponLaunchedSounds setObject:[eqType fxWeaponLaunchedName] forKey:[eqType identifier]];
[shieldHitSounds setObject:[eqType fxShieldHitName] forKey:[eqType identifier]];
[unshieldedHitSounds setObject:[eqType fxUnshieldedHitName] forKey:[eqType identifier]];
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxWeaponLaunchedName, weaponLaunchedSounds);
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxShieldHitName, shieldHitSounds);
OO_ASSIGN_SOUNDSTR_TO_SOUNDS(fxUnshieldedHitName, unshieldedHitSounds);
}
}

Expand Down
1 change: 0 additions & 1 deletion src/Core/HeadUpDisplay.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ @implementation HeadUpDisplay
static const GLfloat yellow_color[4] = {1.0, 1.0, 0.0, 1.0};
static const GLfloat green_color[4] = {0.0, 1.0, 0.0, 1.0};
static const GLfloat darkgreen_color[4] = {0.0, 0.75, 0.0, 1.0};
static const GLfloat cyan_color[4] = {0.0, 1.0, 1.0, 1.0};
static const GLfloat blue_color[4] = {0.0, 0.0, 1.0, 1.0};
static const GLfloat black_color[4] = {0.0, 0.0, 0.0, 1.0};
static const GLfloat lightgray_color[4] = {0.25, 0.25, 0.25, 1.0};
Expand Down
2 changes: 1 addition & 1 deletion src/SDL/MyOpenGLView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ - (id) init
}

int testAttrib = -1;
OOLog(@"display.initGL", @"Achieved color / depth buffer sizes (bits):");
OOLog(@"display.initGL", @"%@", @"Achieved color / depth buffer sizes (bits):");
SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &testAttrib);
OOLog(@"display.initGL", @"Red: %d", testAttrib);
SDL_GL_GetAttribute(SDL_GL_GREEN_SIZE, &testAttrib);
Expand Down