Skip to content

Commit 6b79c67

Browse files
committed
Fix more dangerous expressions
1 parent 1c40428 commit 6b79c67

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Client/game_sa/CFireManagerSA.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define FUNC_StartFire 0x48EC30
2222
#define FUNC_StartFire_Vec 0x539F00 // ##SA##
2323

24-
#define ARRAY_CFire VAR_CFireCount + 4
24+
#define ARRAY_CFire (VAR_CFireCount + 4)
2525

2626
#define CLASS_CFireManager 0xB71F80 //##SA##
2727

Server/mods/deathmatch/logic/luadefs/CLuaDefs.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434

3535
// Used by script handlers to verify elements
3636
#define SCRIPT_VERIFY_BLIP(blip) (m_pBlipManager->Exists(blip)&&!blip->IsBeingDeleted())
37-
#define SCRIPT_VERIFY_ELEMENT(element) (element!=NULL&&m_pRootElement->IsMyChild(element,true)&&!element->IsBeingDeleted())
38-
#define SCRIPT_VERIFY_ENTITY(entity) (entity!=NULL&&m_pRootElement->IsMyChild(entity,true)&&entity->IsEntity()&&!entity->IsBeingDeleted())
37+
#define SCRIPT_VERIFY_ELEMENT(element) ((element)!=NULL&&m_pRootElement->IsMyChild((element),true)&&!element->IsBeingDeleted())
38+
#define SCRIPT_VERIFY_ENTITY(entity) ((entity)!=NULL&&m_pRootElement->IsMyChild((entity),true)&&entity->IsEntity()&&!entity->IsBeingDeleted())
3939
#define SCRIPT_VERIFY_MARKER(marker) (m_pMarkerManager->Exists(marker)&&!marker->IsBeingDeleted())
4040
#define SCRIPT_VERIFY_OBJECT(object) (m_pObjectManager->Exists(object)&&!object->IsBeingDeleted())
4141
#define SCRIPT_VERIFY_PICKUP(pickup) (m_pPickupManager->Exists(pickup)&&!pickup->IsBeingDeleted())
4242
#define SCRIPT_VERIFY_PLAYER(player) (m_pPlayerManager->Exists(player)&&!player->IsBeingDeleted())
43-
#define SCRIPT_VERIFY_FUNCTION(func) (func!=LUA_REFNIL)
43+
#define SCRIPT_VERIFY_FUNCTION(func) ((func)!=LUA_REFNIL)
4444
#define SCRIPT_VERIFY_RADAR_AREA(radararea) (m_pRadarAreaManager->Exists(radararea)&&!radararea->IsBeingDeleted())
4545
#define SCRIPT_VERIFY_VEHICLE(vehicle) (m_pVehicleManager->Exists(vehicle)&&!vehicle->IsBeingDeleted())
4646
#define SCRIPT_VERIFY_TIMER(timer) (luaMain->GetTimerManager ()->Exists(timer))
@@ -84,4 +84,4 @@ class CLuaDefs
8484
static CResourceManager* m_pResourceManager;
8585
static CAccessControlListManager* m_pACLManager;
8686
static CMainConfig* m_pMainConfig;
87-
};
87+
};

Server/sdk/MTAPlatform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ typedef int socklen_t;
9595
#endif
9696

9797
#ifndef Sleep
98-
#define Sleep(duration) usleep(duration * 1000)
98+
#define Sleep(duration) usleep((duration) * 1000)
9999
#endif
100100

101101
#endif

0 commit comments

Comments
 (0)