Remaster merge commit '808f748f'

CMakeLists.txt

@@ -65,7 +65,7 @@ option(CURL_SUPPORT "cURL support" ON)
 option(OPENAL_SUPPORT "OpenAL support" ON)
 option(SYSTEMWIDE_SUPPORT "Enable systemwide installation of game assets" OFF)
 option(SDL3_SUPPORT "Build against SDL 3 instead of SDL2" OFF)
-option(GL1_RENDERER "Build the GL3 renderer" ON)
+option(GL1_RENDERER "Build the GL1 renderer" ON)
 option(GL3_RENDERER "Build the GL3 renderer" ON)
 option(GLES1_RENDERER "Build the GLES1 renderer" OFF)
 option(GLES3_RENDERER "Build the GLES3 renderer" ON)
@@ -169,10 +169,10 @@ unset(cpu)
 
 # Systemwide installation of game assets.
 if(${SYSTEMWIDE_SUPPORT})
-    add_definitions(-DSYSTEMWIDE)
-    if(NOT ${SYSTEMDIR} STREQUAL "")
-      add_definitions(-DSYSTEMDIR="${SYSTEMDIR}")
-    endif()
+	add_definitions(-DSYSTEMWIDE)
+	if(NOT ${SYSTEMDIR} STREQUAL "")
+		add_definitions(-DSYSTEMDIR="${SYSTEMDIR}")
+	endif()
 endif()
 
 # We need to pass some options to minizip / unzip.
@@ -195,11 +195,11 @@ else()
 endif()
 
 if(GL1_RENDERER)
-     # We need an OpenGL implementation.
-     set(OpenGL_GL_PREFERENCE GLVND)
-     find_package(OpenGL REQUIRED)
-     list(APPEND yquake2IncludeDirectories ${OPENGL_INCLUDE_DIR})
-     list(APPEND yquake2OpenGLLinkerFlags ${OPENGL_LIBRARIES})
+	# We need an OpenGL implementation.
+	set(OpenGL_GL_PREFERENCE GLVND)
+	find_package(OpenGL REQUIRED)
+	list(APPEND yquake2IncludeDirectories ${OPENGL_INCLUDE_DIR})
+	list(APPEND yquake2OpenGLLinkerFlags ${OPENGL_LIBRARIES})
 endif()
 
 # backtrace lookup
@@ -260,7 +260,7 @@ else()
 		list(APPEND yquake2LinkerFlags "-rdynamic")
 	else()
 		list(APPEND yquake2LinkerFlags "-lnetwork")
-                set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+			set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 	endif()
 	if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 		list(APPEND yquake2LinkerFlags "-lsocket -lnsl")

README.md

@@ -231,6 +231,7 @@ Goals:
 * [ ] Rearange surfaces in vulkan render before render,
 * [ ] Fully implement `target_camera`,
 * [ ] Fully implement `misc_flare`,
+* [x] Fix player height with enabled flashlight,
 * [ ] Single player ReRelease support,
 * [ ] Support effects and additional flags for ReRelease when possible.
 * [ ] Use shared model cache in client code insted reimplemnet in each render,

doc/040_cvarlist.md

@@ -253,6 +253,8 @@ it's `+set busywait 0` (setting the `busywait` cvar) and `-portable`
   or other source of `localization/loc_english.txt` like file.
   Defaults to `english`.
 
+* **g_itemsbobeffect**: Bob effect of items like in ReRelease. Defaults to `0`.
+
 * **g_swap_speed**: Sets the speed of the "changing weapon" animation.
   Default is `1`. If set to `2`, it will be double the speed, `3` is
   the triple... up until the max of `8`, since there are at least 2

src/client/cl_entities.c

@@ -35,13 +35,12 @@ CL_AddPacketEntities(frame_t *frame)
 {
 	entity_t ent = {0};
 	entity_state_t *s1;
-	float autorotate;
+	float autorotate, autobob;
 	int i;
 	int pnum;
 	centity_t *cent;
 	int autoanim;
 	clientinfo_t *ci;
-	unsigned int effects, renderfx;
 
 	/* To distinguish baseq2, xatrix and rogue. */
 	cvar_t *gametype = Cvar_Get("gametype",  "", CVAR_LATCH | CVAR_SERVERINFO);
@@ -57,15 +56,19 @@ CL_AddPacketEntities(frame_t *frame)
 
 	/* brush models can auto animate their frames */
 	autoanim = 2 * cl.time / 1000;
+	autobob = 5 * sinf(cl.time / 400.0f);
 
 	for (pnum = 0; pnum < frame->num_entities; pnum++)
 	{
+		unsigned int effects, renderfx, rr_effects;
+
 		s1 = &cl_parse_entities[(frame->parse_entities +
 				pnum) & (MAX_PARSE_ENTITIES - 1)];
 
 		cent = &cl_entities[s1->number];
 
 		effects = s1->effects;
+		rr_effects = s1->rr_effects;
 		renderfx = s1->renderfx;
 
 		/* set frame */
@@ -139,10 +142,15 @@ CL_AddPacketEntities(frame_t *frame)
 			for (i = 0; i < 3; i++)
 			{
 				ent.origin[i] = ent.oldorigin[i] = cent->prev.origin[i] + cl.lerpfrac *
-				   	(cent->current.origin[i] - cent->prev.origin[i]);
+					(cent->current.origin[i] - cent->prev.origin[i]);
 			}
 		}
 
+		if (effects & EF_BOB) {
+			ent.origin[2] += autobob;
+			ent.oldorigin[2] += autobob;
+		}
+
 		/* tweak the color of beams */
 		if (renderfx & RF_BEAM)
 		{
@@ -261,6 +269,20 @@ CL_AddPacketEntities(frame_t *frame)
 			}
 		}
 
+		if (rr_effects & EF_FLASHLIGHT) {
+			vec3_t forward, start, end;
+			trace_t trace;
+			int mask = CONTENTS_SOLID | CONTENTS_MONSTER;
+
+			AngleVectors(ent.angles, forward, NULL, NULL);
+			VectorMA(ent.origin, 1024, forward, end);
+			VectorCopy(ent.origin, start);
+
+			trace = CM_BoxTrace(start, end, vec3_origin, vec3_origin, 0, mask);
+
+			V_AddLight(trace.endpos, 128, 1, 1, 1);
+		}
+
 		if (s1->number == cl.playernum + 1)
 		{
 			ent.flags |= RF_VIEWERMODEL;

src/client/cl_parse.c

@@ -268,6 +268,27 @@ CL_ParseDelta(entity_state_t *from, entity_state_t *to, int number, int bits)
 		to->effects = MSG_ReadShort(&net_message);
 	}
 
+	/* ReRelease effects */
+	if (cls.serverProtocol != PROTOCOL_VERSION)
+	{
+		to->rr_effects = 0;
+	}
+	else
+	{
+		if ((bits & (U_EFFECTS8 | U_EFFECTS16)) == (U_EFFECTS8 | U_EFFECTS16))
+		{
+			to->rr_effects = MSG_ReadLong(&net_message);
+		}
+		else if (bits & U_EFFECTS8)
+		{
+			to->rr_effects = MSG_ReadByte(&net_message);
+		}
+		else if (bits & U_EFFECTS16)
+		{
+			to->rr_effects = MSG_ReadShort(&net_message);
+		}
+	}
+
 	if ((bits & (U_RENDERFX8 | U_RENDERFX16)) == (U_RENDERFX8 | U_RENDERFX16))
 	{
 		to->renderfx = MSG_ReadLong(&net_message);

src/client/refresh/soft/sw_main.c

@@ -1854,9 +1854,9 @@ GetRefAPI(refimport_t imp)
 	refexport.EndWorldRenderpass = RE_EndWorldRenderpass;
 	refexport.EndFrame = RE_EndFrame;
 
-    // Tell the client that we're unsing the
+	// Tell the client that we're unsing the
 	// new renderer restart API.
-    ri.Vid_RequestRestart(RESTART_NO);
+	ri.Vid_RequestRestart(RESTART_NO);
 
 	Swap_Init ();
 
@@ -1909,10 +1909,10 @@ RE_InitContext(void *win)
 		SDL_SetRenderVSync(renderer, 1);
 #else
 		renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-                if(!renderer)
-                {
-                	renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE | SDL_RENDERER_PRESENTVSYNC);
-                }
+		if(!renderer)
+		{
+			renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE | SDL_RENDERER_PRESENTVSYNC);
+		}
 #endif
 	}
 	else
@@ -1921,10 +1921,10 @@ RE_InitContext(void *win)
 		renderer = SDL_CreateRenderer(window, NULL);
 #else
 		renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
-                if(!renderer)
-                {
-                	renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
-                }
+		if(!renderer)
+		{
+			renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
+		}
 #endif
 	}
 	if(!renderer) {

src/client/vid/glimp_sdl2.c

@@ -376,7 +376,7 @@ ShutdownGraphics(void)
 		}
 		else {
 			SDL_GetWindowPosition(window,
-				      &last_position_x, &last_position_y);
+				&last_position_x, &last_position_y);
 		}
 
 		/* cleanly ungrab input (needs window) */
@@ -640,8 +640,7 @@ GLimp_InitGraphics(int fullscreen, int *pwidth, int *pheight)
 		Com_Printf("Real display mode: %ix%i@%i\n", mode.w, mode.h, mode.refresh_rate);
 	}
 
-
-    /* Initialize rendering context. */
+	/* Initialize rendering context. */
 	if (!re.InitContext(window))
 	{
 		/* InitContext() should have logged an error. */

src/common/header/shared.h

@@ -749,6 +749,7 @@ typedef struct
  * it has a zero index model. */
 #define EF_ROTATE 0x00000001                /* rotate (bonus items) */
 #define EF_GIB 0x00000002                   /* leave a trail */
+#define EF_BOB 0x00000004                   /* ReRelease BoB effect */
 #define EF_BLASTER 0x00000008               /* redlight + trail */
 #define EF_ROCKET 0x00000010                /* redlight + trail */
 #define EF_GRENADE 0x00000020
@@ -817,6 +818,10 @@ typedef struct
 #define EF_CHICKEN					0x00400000	// The flag that tells the system that the player is
 												// a chicken, and not corvus.
 
+/* entity_state_t->rr_effects
+ * ReRelease flags, values are diffeent to quake 2 RR code */
+#define EF_FLASHLIGHT 0x00000001         /* project flashlight, only for players */
+
 /* entity_state_t->renderfx flags */
 #define RF_MINLIGHT 1               /* allways have some light (viewmodel) */
 #define RF_VIEWERMODEL 2            /* don't draw through eyes, only mirrors */
@@ -1437,7 +1442,8 @@ typedef struct entity_state_s
 							/* events only go out for a single frame, they */
 							/* are automatically cleared each frame */
 	/* New protocol fields */
-	vec3_t scale;
+	vec3_t scale; /* model scale */
+	unsigned int rr_effects;
 
 	short			clientnum;		// In Quake 2, the client num was passed in skinnum.  We need this value, however.
 

src/common/movemsg.c

@@ -540,14 +540,14 @@ MSG_WriteDeltaEntity(entity_state_t *from,
 		}
 	}
 
-	if (to->effects != from->effects)
+	if ((to->effects != from->effects) || (to->rr_effects != from->rr_effects))
 	{
-		if (to->effects < 256)
+		if ((to->effects < 256) && (to->rr_effects < 256))
 		{
 			bits |= U_EFFECTS8;
 		}
 
-		else if (to->effects < 0x8000)
+		else if ((to->effects < 0x8000) && (to->rr_effects < 0x8000))
 		{
 			bits |= U_EFFECTS16;
 		}
@@ -770,6 +770,25 @@ MSG_WriteDeltaEntity(entity_state_t *from,
 		MSG_WriteShort(msg, to->effects);
 	}
 
+	/* ReRelease effects */
+	if (protocol == PROTOCOL_VERSION)
+	{
+		if ((bits & (U_EFFECTS8 | U_EFFECTS16)) == (U_EFFECTS8 | U_EFFECTS16))
+		{
+			MSG_WriteLong(msg, to->rr_effects);
+		}
+
+		else if (bits & U_EFFECTS8)
+		{
+			MSG_WriteByte(msg, to->rr_effects);
+		}
+
+		else if (bits & U_EFFECTS16)
+		{
+			MSG_WriteShort(msg, to->rr_effects);
+		}
+	}
+
 	if ((bits & (U_RENDERFX8 | U_RENDERFX16)) == (U_RENDERFX8 | U_RENDERFX16))
 	{
 		MSG_WriteLong(msg, to->renderfx);