Skip to content

Implement customdatatype for Streamer_GetNearbyItems & Streamer_GetAllVisibleItems #491

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Implement customdatatype for Streamer_GetNearbyItems & Streamer_GetAllVisibleItems #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f30b20
Added optional argument "customdatatype" to "Streamer_GetNearbyItems …
NoPressF Jul 17, 2024
901ca5e
Removed useless logError
NoPressF Sep 19, 2024
1a7dce9
Merge branch 'samp-incognito:master' into master
NoPressF Oct 17, 2025
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
28 changes: 14 additions & 14 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.5)
project(streamer)

set(PLUGIN_VERSION "2.9.6")
set(PLUGIN_VERSION "2.9.7")
set(CMAKE_CXX_STANDARD 17)

if (MSVC)
Expand All @@ -20,10 +20,10 @@ include_directories(${SAMPSDK_DIR}/amx)
include_directories(${PROJECT_SOURCE_DIR}/lib/boost)

if(EIGEN3_INCLUDE_DIR)
file(TO_CMAKE_PATH ${EIGEN3_INCLUDE_DIR} EIGEN3_INCLUDE_DIR)
list(APPEND CMAKE_MODULE_PATH "${EIGEN3_INCLUDE_DIR}/cmake")
file(TO_CMAKE_PATH ${EIGEN3_INCLUDE_DIR} EIGEN3_INCLUDE_DIR)
list(APPEND CMAKE_MODULE_PATH "${EIGEN3_INCLUDE_DIR}/cmake")
else()
set(EIGEN3_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/eigen")
set(EIGEN3_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/eigen")
endif()

find_package(Eigen3 3.3.4 REQUIRED)
Expand All @@ -37,25 +37,25 @@ add_subdirectory(src)
set(CPACK_PACKAGE_VERSION ${PLUGIN_VERSION})

if(COMMIT_ID)
string(TIMESTAMP CURRENT_DATE "%Y%m%d")
set(PACKAGE_FILE_NAME streamer-${PLUGIN_VERSION}-${CURRENT_DATE}-${COMMIT_ID})
string(TIMESTAMP CURRENT_DATE "%Y%m%d")
set(PACKAGE_FILE_NAME streamer-${PLUGIN_VERSION}-${CURRENT_DATE}-${COMMIT_ID})
else()
set(PACKAGE_FILE_NAME streamer-${PLUGIN_VERSION})
set(PACKAGE_FILE_NAME streamer-${PLUGIN_VERSION})
endif()

set(CPACK_OUTPUT_FILE_PREFIX package/${PACKAGE_FILE_NAME})

if(WIN32)
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME}-win32)
set(CPACK_GENERATOR ZIP)
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME}-win32)
set(CPACK_GENERATOR ZIP)
else()
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME}-linux)
set(CPACK_GENERATOR TGZ)
set(CPACK_PACKAGE_FILE_NAME ${PACKAGE_FILE_NAME}-linux)
set(CPACK_GENERATOR TGZ)
endif()

if(CPACK_OUTPUT_FILE_POSTFIX)
string(TOLOWER "${CPACK_OUTPUT_FILE_POSTFIX}" CPACK_OUTPUT_FILE_POSTFIX)
set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-${CPACK_OUTPUT_FILE_POSTFIX})
string(TOLOWER "${CPACK_OUTPUT_FILE_POSTFIX}" CPACK_OUTPUT_FILE_POSTFIX)
set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-${CPACK_OUTPUT_FILE_POSTFIX})
endif()

include(CPack)
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else()
set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " -lrt")
endif()

add_definitions(-DSAMPGDK_AMALGAMATION -DSAMPGDK_CPP_WRAPPERS -D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING -D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING)
add_definitions(-DSAMPGDK_AMALGAMATION -D_SILENCE_CXX17_NEGATORS_DEPRECATION_WARNING -D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING)

set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
target_link_libraries(${PROJECT_NAME})
Expand Down
2 changes: 2 additions & 0 deletions src/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@

#define STREAMER_STATIC_DISTANCE_CUTOFF (0.0f)

#define STREAMER_ITEM_MIN_CUSTOM_VALUE (0x40000000 & ~0x80000000)

class Cell;
class Data;
class Events;
Expand Down
4 changes: 2 additions & 2 deletions src/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef MAIN_H
#define MAIN_H

#define INCLUDE_FILE_VERSION (0x296)
#define PLUGIN_VERSION "2.9.6"
#define INCLUDE_FILE_VERSION (0x297)
#define PLUGIN_VERSION "2.9.7"

#include <boost/bimap.hpp>
#include <boost/bimap/multiset_of.hpp>
Expand Down
8 changes: 8 additions & 0 deletions src/manipulation/int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,3 +1787,11 @@ int Manipulation::setIntData(AMX *amx, cell *params)
}
return 0;
}

void Manipulation::getIntExtraDataParams(cell *params, cell *extraParams, int object, int customDataType)
{
extraParams[0] = sizeof(*extraParams);
extraParams[1] = static_cast<int>(params[4]);
extraParams[2] = object;
extraParams[3] = customDataType;
}
2 changes: 2 additions & 0 deletions src/manipulation/int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ namespace Manipulation
int setIntData(AMX *amx, cell *params);
int removeIntData(AMX *amx, cell *params);
int hasIntData(AMX *amx, cell *params);

void getIntExtraDataParams(cell *params, cell *extraParams, int object, int customDataType);
}

#endif
Loading