Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
empfun
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sourcemod
empfun
Commits
222f24f4
Commit
222f24f4
authored
Sep 27, 2020
by
Mikleo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add hMin and hMax
parent
404e9c79
Pipeline
#10974
passed with stages
in 16 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
dist/addons/sourcemod/plugins/empfun.smx
dist/addons/sourcemod/plugins/empfun.smx
+0
-0
dist/addons/sourcemod/scripting/empfun.sp
dist/addons/sourcemod/scripting/empfun.sp
+15
-7
dist/updater.txt
dist/updater.txt
+1
-1
No files found.
dist/addons/sourcemod/plugins/empfun.smx
View file @
222f24f4
No preview for this file type
dist/addons/sourcemod/scripting/empfun.sp
View file @
222f24f4
...
...
@@ -10,7 +10,7 @@
#include <SteamWorks>
#define PluginVersion "1.2
3
"
#define PluginVersion "1.2
4
"
float pVersion;
// note linearmap field is unstable
...
...
@@ -4141,8 +4141,16 @@ bool LoadScenario(int client,char[] filename)
LoadCvars(kv);
int hLimit = kv.GetNum("hLimit",BASEHAMMERID -1 );
int hMin = kv.GetNum("hMin",0 );
int hMax = kv.GetNum("hMax",0 );
if(hMax > 0)
hLimit = hMax;
kv.JumpToKey("Entities");
LoadEntities(kv,version,hLimit);
LoadEntities(kv,version,h
Min,h
Limit);
...
...
@@ -4363,7 +4371,7 @@ void SaveEntities(KeyValues kv)
LoadEntities(KeyValues kv,float version,int hLimit)
LoadEntities(KeyValues kv,float version,int h
Min,int h
Limit)
{
int max_hammer_id = BASEHAMMERID;
...
...
@@ -4405,7 +4413,7 @@ LoadEntities(KeyValues kv,float version,int hLimit)
int entity = -1;
// if they are not a custom element just reload them regardless.
if( hammer_id <= hLimit)
if( hammer_id <= hLimit
&& hammer_id >= hMin
)
entity = findEntityWithHammerID(hammer_id,className);
entity = RestoreEntity(entity,kv,classInfo,className);
...
...
@@ -4427,7 +4435,7 @@ LoadEntities(KeyValues kv,float version,int hLimit)
kv.Rewind();
RemoveSavableEntitiesExcept(includedEntities,version,hLimit);
RemoveSavableEntitiesExcept(includedEntities,version,h
Min,h
Limit);
delete includedEntities;
...
...
@@ -4839,7 +4847,7 @@ RestoreEntity(int entity,KeyValues kv,any[] classInfo ,char[] className)
return entity;
}
RemoveSavableEntitiesExcept(ArrayList list,float version, int hLimit)
RemoveSavableEntitiesExcept(ArrayList list,float version,
int hMin,
int hLimit)
{
// get logic entities as well.
int maxEntities = GetMaxEntities() * 2;
...
...
@@ -4853,7 +4861,7 @@ RemoveSavableEntitiesExcept(ArrayList list,float version, int hLimit)
GetEntityClassname(entity, className, sizeof(className));
int hammerID = GetEntProp(entity,Prop_Data,"m_iHammerID");
if((hammerID <= hLimit || hammerID >= BASEHAMMERID) && GetEntitySavingKeys(className,version,classInfo) && list.FindValue(entity) == -1 && ShouldSave(entity,className,classInfo))
if(
hammerID >= hMin &&
(hammerID <= hLimit || hammerID >= BASEHAMMERID) && GetEntitySavingKeys(className,version,classInfo) && list.FindValue(entity) == -1 && ShouldSave(entity,className,classInfo))
{
// remove this entity
ExecuteRemoveEntity(entity);
...
...
dist/updater.txt
View file @
222f24f4
...
...
@@ -4,7 +4,7 @@
{
"Version"
{
"Latest" "1.2
3
"
"Latest" "1.2
4
"
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment