my public repos

Commit Diff

Commit:: a1e2c7f5ba3d8417bd44729e336d7af53ecb3054
From:: the xhr <xhr@giessen.ccc.de>
Date:: Thu Sep 16 13:57:31 2021 UTC
Message:: Break at 80 chars
Actions:: Patch | Tree
commit - d6e4bd9dfadf341f2b369e51c1656260f549ed12
commit + a1e2c7f5ba3d8417bd44729e336d7af53ecb3054
blob - 71c3b08d83c64ab47e38b22b104b6e019be4d641
blob + d1a03f64008d4bcaa8117f042b083ec5b1b8d965
--- character.c
+++ character.c
@@ -284,7 +284,8 @@ set_max_momentum()
 		curchar->cursed - curchar->corrupted - curchar->tormented;
 
 	if (mm != curchar->max_momentum) {
-		printf("Your max momentum changed from %d to %d\n", curchar->max_momentum, mm);
+		printf("Your max momentum changed from %d to %d\n",
+			curchar->max_momentum, mm);
 		curchar->max_momentum = mm;
 	}
 
@@ -298,7 +299,8 @@ set_max_momentum()
 	if (mm < 0)
 		mm = 0;
 	if (mm != curchar->momentum_reset) {
-		printf("Your reset momentum changed from %d to %d\n", curchar->momentum_reset, mm);
+		printf("Your reset momentum changed from %d to %d\n",
+			curchar->momentum_reset, mm);
 		curchar->momentum_reset = mm;
 	}
 
@@ -342,7 +344,8 @@ change_char_value(const char *value, int what, int how
 		modify_value(value, &curchar->exp, 30, 0, howmany, what);
 		return;
 	} else if (strcasecmp(value, "momentum") == 0) {
-		modify_value(value, &curchar->momentum, curchar->max_momentum, -6, howmany, what);
+		modify_value(value, &curchar->momentum, curchar->max_momentum, -6,
+			howmany, what);
 		return;
 	} else if (strcasecmp(value, "health") == 0) {
 		if (curchar->wounded == 1) {
@@ -373,7 +376,8 @@ change_char_value(const char *value, int what, int how
 }
 
 void
-modify_value(const char *str, int *value, int max, int min, int howmany, int what)
+modify_value(const char *str, int *value, int max, int min, int howmany,
+	int what)
 {
 	if (what == 0) {
 		if (*value >= max) {
@@ -435,25 +439,38 @@ save_character()
 	json_object_object_add(cobj, "shadow", json_object_new_int(curchar->shadow));
 	json_object_object_add(cobj, "wits", json_object_new_int(curchar->wits));
 	json_object_object_add(cobj, "exp", json_object_new_int(curchar->exp));
-	json_object_object_add(cobj, "momentum", json_object_new_int(curchar->momentum));
-	json_object_object_add(cobj, "max_momentum", json_object_new_int(curchar->max_momentum));
-	json_object_object_add(cobj, "momentum_reset", json_object_new_int(curchar->momentum_reset));
+	json_object_object_add(cobj, "momentum",
+		json_object_new_int(curchar->momentum));
+	json_object_object_add(cobj, "max_momentum",
+		json_object_new_int(curchar->max_momentum));
+	json_object_object_add(cobj, "momentum_reset",
+		json_object_new_int(curchar->momentum_reset));
 	json_object_object_add(cobj, "health", json_object_new_int(curchar->health));
 	json_object_object_add(cobj, "spirit", json_object_new_int(curchar->spirit));
 	json_object_object_add(cobj, "supply", json_object_new_int(curchar->supply));
-	json_object_object_add(cobj, "wounded", json_object_new_int(curchar->wounded));
-	json_object_object_add(cobj, "unprepared", json_object_new_int(curchar->unprepared));
-	json_object_object_add(cobj, "shaken", json_object_new_int(curchar->shaken));
-	json_object_object_add(cobj, "encumbered", json_object_new_int(curchar->encumbered));
+	json_object_object_add(cobj, "wounded",
+		json_object_new_int(curchar->wounded));
+	json_object_object_add(cobj, "unprepared",
+		json_object_new_int(curchar->unprepared));
+	json_object_object_add(cobj, "shaken",
+			json_object_new_int(curchar->shaken));
+	json_object_object_add(cobj, "encumbered",
+		json_object_new_int(curchar->encumbered));
 	json_object_object_add(cobj, "maimed", json_object_new_int(curchar->maimed));
 	json_object_object_add(cobj, "cursed", json_object_new_int(curchar->cursed));
 	json_object_object_add(cobj, "dead", json_object_new_int(curchar->dead));
-	json_object_object_add(cobj, "corrupted", json_object_new_int(curchar->corrupted));
-	json_object_object_add(cobj, "tormented", json_object_new_int(curchar->tormented));
-	json_object_object_add(cobj, "exp_used", json_object_new_int(curchar->exp_used));
-	json_object_object_add(cobj, "bonds", json_object_new_double(curchar->bonds));
-	json_object_object_add(cobj, "journey_active", json_object_new_int(curchar->journey_active));
-	json_object_object_add(cobj, "fight_active", json_object_new_int(curchar->fight_active));
+	json_object_object_add(cobj, "corrupted",
+		json_object_new_int(curchar->corrupted));
+	json_object_object_add(cobj, "tormented",
+		json_object_new_int(curchar->tormented));
+	json_object_object_add(cobj, "exp_used",
+		json_object_new_int(curchar->exp_used));
+	json_object_object_add(cobj, "bonds",
+		json_object_new_double(curchar->bonds));
+	json_object_object_add(cobj, "journey_active",
+		json_object_new_int(curchar->journey_active));
+	json_object_object_add(cobj, "fight_active",
+		json_object_new_int(curchar->fight_active));
 
 	snprintf(path, sizeof(path), "%s/characters.json", get_isscrolls_dir());
 	if ((root = json_object_from_file(path)) == NULL) {
@@ -619,7 +636,8 @@ load_character(int id)
 		if (id == json_object_get_int(lid)) {
 			json_object_object_get_ex(temp, "name", &name);
 
-			log_debug("Loading character %s, id: %d\n", json_object_get_string(name), json_object_get_int(lid));
+			log_debug("Loading character %s, id: %d\n", json_object_get_string(name),
+				json_object_get_int(lid));
 
 			snprintf(c->name, MAX_CHAR_LEN, "%s", json_object_get_string(name));
 			c->id		 = id;
@@ -717,8 +735,8 @@ print_character()
 	printf("\nEdge: %d Heart: %d Iron: %d Shadow: %d Wits %d\n\n",
 		curchar->edge, curchar->heart, curchar->iron, curchar->shadow, curchar->wits);
 	printf("Momentum: %d/%d [%d] Health: %d/5 Spirit: %d/5 Supply: %d/5\n",
-		curchar->momentum, curchar-> max_momentum, curchar->momentum_reset, curchar->health, curchar->spirit,
-		curchar->supply);
+		curchar->momentum, curchar-> max_momentum, curchar->momentum_reset,
+		curchar->health, curchar->spirit, curchar->supply);
 
 	printf("\nWounded:\t%d Unprepared:\t%d Encumbered:\t%d Shaken:\t%d\n",
 		curchar->wounded, curchar->unprepared, curchar->encumbered, curchar->shaken);
@@ -728,12 +746,12 @@ print_character()
 	printf("\nBonds: %.2f\n", curchar->bonds);
 
 	if (curchar->journey_active == 1) {
-		printf("\nActive Journey: Difficulty: %d Progress: %.2f/10\n", curchar->j->difficulty,
-			curchar->j->progress);
+		printf("\nActive Journey: Difficulty: %d Progress: %.2f/10\n",
+			curchar->j->difficulty, curchar->j->progress);
 	}
 	if (curchar->fight_active == 1) {
-		printf("\nActive Fight: Difficulty: %d Progress: %.2f/10\n", curchar->fight->difficulty,
-			curchar->fight->progress);
+		printf("\nActive Fight: Difficulty: %d Progress: %.2f/10\n",
+			curchar->fight->difficulty, curchar->fight->progress);
 	}
 }