From fa501d1cc5247ea7126925006fdc8e85a11be795 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Fri, 12 May 2017 11:17:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=93=D0=B4=D0=B5=20=D0=B2=D0=BE=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20System.out/err=20=D0=BD=D0=B0=20logger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lwjake2/client/CL.java             | 5 ++++-
 src/lwjake2/game/edict_t.java          | 5 ++++-
 src/lwjake2/game/gclient_t.java        | 6 ++++--
 src/lwjake2/game/level_locals_t.java   | 6 ++++--
 src/lwjake2/sound/lwjgl/PlaySound.java | 5 ++++-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/lwjake2/client/CL.java b/src/lwjake2/client/CL.java
index 47ccbcb..8f0afe6 100644
--- a/src/lwjake2/client/CL.java
+++ b/src/lwjake2/client/CL.java
@@ -46,6 +46,8 @@ import lwjake2.sys.Timer;
 import lwjake2.util.Lib;
 import lwjake2.util.Math3D;
 import lwjake2.util.Vargs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -56,6 +58,7 @@ import java.nio.ByteOrder;
  * CL
  */
 public final class CL {
+    private static final Logger logger = LoggerFactory.getLogger(CL.class);
     
     static int precache_check; // for autodownload of precache items
 
@@ -1573,7 +1576,7 @@ public final class CL {
     public static void Shutdown() {
 
         if (isdown) {
-            System.out.print("recursive shutdown\n");
+            logger.info("recursive shutdown");
             return;
         }
         isdown = true;
diff --git a/src/lwjake2/game/edict_t.java b/src/lwjake2/game/edict_t.java
index 377cf08..282b45b 100644
--- a/src/lwjake2/game/edict_t.java
+++ b/src/lwjake2/game/edict_t.java
@@ -22,10 +22,13 @@ import lwjake2.Defines;
 import lwjake2.qcommon.Com;
 import lwjake2.util.Lib;
 import lwjake2.util.QuakeFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class edict_t {
+    private final Logger logger = LoggerFactory.getLogger(edict_t.class);
 
     /** Constructor. */
     public edict_t(int i) {
@@ -768,6 +771,6 @@ public class edict_t {
 
         // rst's checker :-)
         if (f.readInt() != 9876)
-            System.err.println("ent load check failed for num " + index);
+            logger.error("ent load check failed for num {}", index);
     }
 }
\ No newline at end of file
diff --git a/src/lwjake2/game/gclient_t.java b/src/lwjake2/game/gclient_t.java
index 71e11ad..3951dfe 100644
--- a/src/lwjake2/game/gclient_t.java
+++ b/src/lwjake2/game/gclient_t.java
@@ -19,12 +19,14 @@
 package lwjake2.game;
 
 import lwjake2.util.QuakeFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class gclient_t
 {
-
+	private final Logger logger = LoggerFactory.getLogger(gclient_t.class);
 	public gclient_t(int index)
 	{
 		this.index = index;
@@ -303,7 +305,7 @@ public class gclient_t
 		update_chase = f.readInt() != 0;
 		
 		if (f.readInt() != 8765)
-			System.err.println("game client load failed for num=" + index);
+			logger.error("game client load failed for num={}", index);
 	}
 	
 	/** Writes a game_client_t (a player) to a file. */ 
diff --git a/src/lwjake2/game/level_locals_t.java b/src/lwjake2/game/level_locals_t.java
index 6bf11d2..2eb19b5 100644
--- a/src/lwjake2/game/level_locals_t.java
+++ b/src/lwjake2/game/level_locals_t.java
@@ -19,12 +19,14 @@
 package lwjake2.game;
 
 import lwjake2.util.QuakeFile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 public class level_locals_t
 {
-	
+	private final Logger logger = LoggerFactory.getLogger(level_locals_t.class);
 	//	this structure is cleared as each map is entered
 	//	it is read/written to the level.sav file for savegames
 	//
@@ -149,6 +151,6 @@ public class level_locals_t
 		
 		// rst's checker :-)
 		if (f.readInt()!= 4711)
-			System.out.println("error in reading level_locals.");
+			logger.error("error in reading level_locals.");
 	}
 }
diff --git a/src/lwjake2/sound/lwjgl/PlaySound.java b/src/lwjake2/sound/lwjgl/PlaySound.java
index 14e681d..4f66dc0 100644
--- a/src/lwjake2/sound/lwjgl/PlaySound.java
+++ b/src/lwjake2/sound/lwjgl/PlaySound.java
@@ -20,6 +20,8 @@ package lwjake2.sound.lwjgl;
 
 import lwjake2.Globals;
 import lwjake2.util.Math3D;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * PlaySound
@@ -27,6 +29,7 @@ import lwjake2.util.Math3D;
  * @author cwei
  */
 public class PlaySound {
+    private static final Logger logger = LoggerFactory.getLogger(PlaySound.class);
     
 	final static int MAX_PLAYSOUNDS = 128;
 	
@@ -155,7 +158,7 @@ public class PlaySound {
             ps.beginTime = Globals.cl.time + (long)(timeoffset * 1000);
             PlaySound.add(ps);
         } else {
-            System.err.println("PlaySounds out of Limit");
+            logger.error("PlaySounds out of Limit");
         }
     }
 }