mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-04 01:37:47 +00:00
Code Activity

Merge pull request #841 from Skyliegirl33/feature-impl

Browse source 
[3.0] Add missing header for Linux and fix quest bitflags
This commit is contained in:
Mordred 2023-01-20 07:30:17 +01:00 • committed by GitHub
commit 453051395c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/tools/nav_export/pcb.h
View file

@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <cstring>
struct PCB_HEADER struct PCB_HEADER
{ {
@ -172,4 +173,4 @@ struct PCB_LIST_FILE
PCB_LIST_BASE_ENTRY entry; PCB_LIST_BASE_ENTRY entry;
std::vector< PCB_LIST_ENTRY > entries; std::vector< PCB_LIST_ENTRY > entries;
}; };
#endif #endif

3
src/tools/pcb_reader/pcb.h
View file

@ -3,6 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <cstring>
struct PCB_HEADER struct PCB_HEADER
{ {
@ -173,4 +174,4 @@ struct PCB_LIST_FILE
PCB_LIST_BASE_ENTRY entry; PCB_LIST_BASE_ENTRY entry;
std::vector< PCB_LIST_ENTRY > entries; std::vector< PCB_LIST_ENTRY > entries;
}; };
#endif #endif

20
src/world/Quest/Quest.cpp
View file

@ -25,31 +25,31 @@ bool Sapphire::World::Quest::getBitFlag8( uint8_t index )
bool Sapphire::World::Quest::getBitFlag16( uint8_t index ) bool Sapphire::World::Quest::getBitFlag16( uint8_t index )
{ {
uint8_t realIdx = 16 - index; uint8_t realIdx = 8 - index;
return m_data.a.BitFlag16 & ( 1 << realIdx ); return m_data.a.BitFlag16 & ( 1 << realIdx );
} }
bool Sapphire::World::Quest::getBitFlag24( uint8_t index ) bool Sapphire::World::Quest::getBitFlag24( uint8_t index )
{ {
uint8_t realIdx = 24 - index; uint8_t realIdx = 8 - index;
return m_data.a.BitFlag24 & ( 1 << realIdx ); return m_data.a.BitFlag24 & ( 1 << realIdx );
} }
bool Sapphire::World::Quest::getBitFlag32( uint8_t index ) bool Sapphire::World::Quest::getBitFlag32( uint8_t index )
{ {
uint8_t realIdx = 32 - index; uint8_t realIdx = 8 - index;
return m_data.a.BitFlag32 & ( 1 << realIdx ); return m_data.a.BitFlag32 & ( 1 << realIdx );
} }
bool Sapphire::World::Quest::getBitFlag40( uint8_t index ) bool Sapphire::World::Quest::getBitFlag40( uint8_t index )
{ {
uint8_t realIdx = 40 - index; uint8_t realIdx = 8 - index;
return m_data.a.BitFlag40 & ( 1 << realIdx ); return m_data.a.BitFlag40 & ( 1 << realIdx );
} }
bool Sapphire::World::Quest::getBitFlag48( uint8_t index ) bool Sapphire::World::Quest::getBitFlag48( uint8_t index )
{ {
uint8_t realIdx = 48 - index; uint8_t realIdx = 8 - index;
return m_data.a.BitFlag48 & ( 1 << realIdx ); return m_data.a.BitFlag48 & ( 1 << realIdx );
} }
@ -320,7 +320,7 @@ void Sapphire::World::Quest::setBitFlag8( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val ) void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val )
{ {
uint8_t realIdx = 16 - index; uint8_t realIdx = 8 - index;
if( val ) if( val )
m_data.a.BitFlag16 |= ( 1 << realIdx ); m_data.a.BitFlag16 |= ( 1 << realIdx );
else else
@ -329,7 +329,7 @@ void Sapphire::World::Quest::setBitFlag16( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val ) void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val )
{ {
uint8_t realIdx = 24 - index; uint8_t realIdx = 8 - index;
if( val ) if( val )
m_data.a.BitFlag24 |= ( 1 << realIdx ); m_data.a.BitFlag24 |= ( 1 << realIdx );
else else
@ -338,7 +338,7 @@ void Sapphire::World::Quest::setBitFlag24( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val ) void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val )
{ {
uint8_t realIdx = 32 - index; uint8_t realIdx = 8 - index;
if( val ) if( val )
m_data.a.BitFlag32 |= ( 1 << realIdx ); m_data.a.BitFlag32 |= ( 1 << realIdx );
else else
@ -347,7 +347,7 @@ void Sapphire::World::Quest::setBitFlag32( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val ) void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val )
{ {
uint8_t realIdx = 40 - index; uint8_t realIdx = 8 - index;
if( val ) if( val )
m_data.a.BitFlag40 |= ( 1 << realIdx ); m_data.a.BitFlag40 |= ( 1 << realIdx );
else else
@ -356,7 +356,7 @@ void Sapphire::World::Quest::setBitFlag40( uint8_t index, bool val )
void Sapphire::World::Quest::setBitFlag48( uint8_t index, bool val ) void Sapphire::World::Quest::setBitFlag48( uint8_t index, bool val )
{ {
uint8_t realIdx = 48 - index; uint8_t realIdx = 8 - index;
if( val ) if( val )
m_data.a.BitFlag48 |= ( 1 << realIdx ); m_data.a.BitFlag48 |= ( 1 << realIdx );
else else